From 2b457a4ea125be122a1b45b8e623fb3d05034a9e Mon Sep 17 00:00:00 2001 From: John Emmons Date: Tue, 23 Feb 2016 02:31:28 +0000 Subject: [PATCH] ICU-12170 Merge data from CLDR release-29-beta1 X-SVN-Rev: 38333 --- icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 2 +- icu4j/main/shared/data/testdata.jar | 2 +- .../tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index fe742a4e5e7..84dbd7c189c 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9479b2912834b67d5c67c51784ccf8b76ec2c6f8037f6e734ca388d83fe1c61 -size 11754043 +oid sha256:f700d6ddaf706003c86b54aba1157e85324ff214504ce0cf340437fae8223dbd +size 11754752 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index cdf800d51c4..5571182e943 100755 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b04a7bb4cab572cd228bf391275b55808095f21629d52c174d2284e81c9162cd +oid sha256:3da8204b14225b5765e7cb870ef54e9929fa24110e0d729a653c38298f6bb549 size 90259 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 81658171e79..90069d5b1fb 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78a2ab108f57cb0f809e187ce3eca1e58690117c68271e3221dfe3a9477e7502 +oid sha256:90856c403af76f254842ad608200bb7bb6adc848075d7fd2e2d7812672d3881f size 811414 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java index e7d2b7bece0..d3031f9422d 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -3368,8 +3368,8 @@ public class ULocaleTest extends TestFmwk { "zh_TW" }, { "und_Hant_CN", - "zh_Hant_CN", - "zh_Hant_CN" + "yue_Hant_CN", + "yue_Hant_CN" }, { "und_Hant_TW", "zh_Hant_TW", -- 2.40.0