ICU-6867 Merged c25984(#6909) from trunk to maint-4-2.
X-SVN-Rev: 25986
diff --git a/src/com/ibm/icu/dev/data/testdata.jar b/src/com/ibm/icu/dev/data/testdata.jar
index b8a8fcf..7c328fd 100755
--- a/src/com/ibm/icu/dev/data/testdata.jar
+++ b/src/com/ibm/icu/dev/data/testdata.jar
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fab5da9407941280f2212c1b8406224b5fcc726a1db418df67c81de8c2409ef2
+oid sha256:dd751b158829ed6eeb388f5c52590f6f79d83d8fb50a29f0fcfe47af393abb8a
size 774992
diff --git a/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/src/com/ibm/icu/dev/test/util/ULocaleTest.java
index 879e4b9..f3b9ac8 100644
--- a/src/com/ibm/icu/dev/test/util/ULocaleTest.java
+++ b/src/com/ibm/icu/dev/test/util/ULocaleTest.java
@@ -1779,7 +1779,7 @@
"ig"
}, {
"ii",
- "ii_Latn_CN",
+ "ii_Yiii_CN",
"ii"
}, {
"is",
@@ -2259,16 +2259,16 @@
"bn_IN"
}, {
"und_CD",
- "fr_Latn_CD",
- "fr_CD"
+ "sw_Latn_CD",
+ "sw_CD"
}, {
"und_CF",
- "sg_Latn_CF",
- "sg"
+ "fr_Latn_CF",
+ "fr_CF"
}, {
"und_CG",
- "ln_Latn_CG",
- "ln_CG"
+ "fr_Latn_CG",
+ "fr_CG"
}, {
"und_CH",
"de_Latn_CH",
@@ -2315,8 +2315,8 @@
"cs"
}, {
"und_Cans",
- "cwd_Cans_CA",
- "cwd"
+ "crk_Cans_CA",
+ "crk"
}, {
"und_Cyrl",
"ru_Cyrl_RU",
@@ -2375,8 +2375,8 @@
"es"
}, {
"und_ET",
- "am_Ethi_ET",
- "am"
+ "en_Latn_ET",
+ "en_ET"
}, {
"und_Ethi",
"am_Ethi_ET",
@@ -2443,8 +2443,8 @@
"es_GT"
}, {
"und_GU",
- "ch_Latn_GU",
- "ch"
+ "en_Latn_GU",
+ "en_GU"
}, {
"und_GW",
"pt_Latn_GW",
@@ -2627,8 +2627,8 @@
"es"
}, {
"und_Latn_ET",
- "om_Latn_ET",
- "om"
+ "en_Latn_ET",
+ "en_ET"
}, {
"und_Latn_GB",
"en_Latn_GB",
@@ -2647,8 +2647,8 @@
"it"
}, {
"und_Latn_NG",
- "ha_Latn_NG",
- "ha"
+ "en_Latn_NG",
+ "en_NG"
}, {
"und_Latn_TR",
"tr_Latn_TR",
@@ -2671,7 +2671,7 @@
"ro_MD"
}, {
"und_ME",
- "sr_Cyrl_ME",
+ "sr_Latn_ME",
"sr_ME"
}, {
"und_MG",
@@ -2751,8 +2751,8 @@
"ha_NE"
}, {
"und_NG",
- "ha_Latn_NG",
- "ha"
+ "en_Latn_NG",
+ "en_NG"
}, {
"und_NI",
"es_Latn_NI",
@@ -2771,8 +2771,8 @@
"ne"
}, {
"und_NR",
- "na_Latn_NR",
- "na"
+ "en_Latn_NR",
+ "en_NR"
}, {
"und_NU",
"niu_Latn_NU",
@@ -2795,8 +2795,8 @@
"es_PE"
}, {
"und_PF",
- "ty_Latn_PF",
- "ty"
+ "fr_Latn_PF",
+ "fr_PF"
}, {
"und_PG",
"tpi_Latn_PG",
@@ -2923,12 +2923,12 @@
"en_Syrc"
}, {
"und_TD",
- "ar_Arab_TD",
- "ar_TD"
+ "fr_Latn_TD",
+ "fr_TD"
}, {
"und_TG",
- "ee_Latn_TG",
- "ee_TG"
+ "fr_Latn_TG",
+ "fr_TG"
}, {
"und_TH",
"th_Thai_TH",
@@ -2939,12 +2939,12 @@
"tg"
}, {
"und_TK",
- "tkl_Latn_TK",
- "tkl"
+ "en_Latn_TK",
+ "en_TK"
}, {
"und_TL",
- "tet_Latn_TL",
- "tet"
+ "pt_Latn_TL",
+ "pt_TL"
}, {
"und_TM",
"tk_Latn_TM",
@@ -3015,8 +3015,8 @@
"vi"
}, {
"und_VU",
- "fr_Latn_VU",
- "fr_VU"
+ "bi_Latn_VU",
+ "bi"
}, {
"und_WF",
"fr_Latn_WF",
@@ -3035,8 +3035,8 @@
"fr_YT"
}, {
"und_Yiii",
- "en_Yiii_US",
- "en_Yiii"
+ "ii_Yiii_CN",
+ "ii"
}, {
"ur",
"ur_Arab_PK",
@@ -3167,8 +3167,8 @@
"en"
}, {
"und_Latn_CN",
- "ii_Latn_CN",
- "ii"
+ "za_Latn_CN",
+ "za"
}, {
"und_Latn_TW",
"zh_Latn_TW",
diff --git a/src/com/ibm/icu/impl/data/icudata.jar b/src/com/ibm/icu/impl/data/icudata.jar
index a509a3a..c32112d 100755
--- a/src/com/ibm/icu/impl/data/icudata.jar
+++ b/src/com/ibm/icu/impl/data/icudata.jar
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1eadbbfc8102cdaba872268daeaf1734783c67111533201f17492d947288a100
-size 7214666
+oid sha256:fa8091988f86a0c01821d4d5ec5e50504f1e92353fcc2ce2f230ea42b2d83d4f
+size 7214747
