summaryrefslogtreecommitdiffstats
path: root/samples/ApiDemos
diff options
context:
space:
mode:
authorJoachim Sauer <jsauer@google.com>2017-03-08 17:49:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-08 17:49:22 +0000
commit96f6845b80ff2070ae5ad73ed31510daae48f308 (patch)
tree888c52e74d035788368a77d860513d49f49e6736 /samples/ApiDemos
parent5230d494570abb81db1c6526447d4b36ead1e612 (diff)
parentcb632200b07099c2b32ad8ba73a7771eb3999efa (diff)
downloadandroid_development-96f6845b80ff2070ae5ad73ed31510daae48f308.tar.gz
android_development-96f6845b80ff2070ae5ad73ed31510daae48f308.tar.bz2
android_development-96f6845b80ff2070ae5ad73ed31510daae48f308.zip
Merge "Renaming Czech Republic to Czechia." am: a824f044c3 am: e7b9cff32e
am: cb632200b0 Change-Id: I79436472ad4a60803db657cbf82b2cde008558a2
Diffstat (limited to 'samples/ApiDemos')
-rw-r--r--samples/ApiDemos/src/com/example/android/apis/view/AutoComplete1.java2
-rw-r--r--samples/ApiDemos/src/com/example/android/apis/view/AutoComplete6.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete1.java b/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete1.java
index bec4a5d83..a13a742ba 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete1.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete1.java
@@ -47,7 +47,7 @@ public class AutoComplete1 extends Activity {
"Cote d'Ivoire", "Cambodia", "Cameroon", "Canada", "Cape Verde",
"Cayman Islands", "Central African Republic", "Chad", "Chile", "China",
"Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo",
- "Cook Islands", "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czech Republic",
+ "Cook Islands", "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czechia",
"Democratic Republic of the Congo", "Denmark", "Djibouti", "Dominica", "Dominican Republic",
"East Timor", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea",
"Estonia", "Ethiopia", "Faeroe Islands", "Falkland Islands", "Fiji", "Finland",
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete6.java b/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete6.java
index 2c28d65ef..0d4b48ef5 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete6.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete6.java
@@ -48,7 +48,7 @@ public class AutoComplete6 extends Activity {
"Cote d'Ivoire", "Cambodia", "Cameroon", "Canada", "Cape Verde",
"Cayman Islands", "Central African Republic", "Chad", "Chile", "China",
"Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo",
- "Cook Islands", "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czech Republic",
+ "Cook Islands", "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czechia",
"Democratic Republic of the Congo", "Denmark", "Djibouti", "Dominica", "Dominican Republic",
"East Timor", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea",
"Estonia", "Ethiopia", "Faeroe Islands", "Falkland Islands", "Fiji", "Finland",