ICU-10898 Updated tzdbNames.res based on tzdata2014f.

X-SVN-Rev: 36145

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 510acc80f367a4568a141ec522ea5bd0054333f2..d0f615bb1edd67754e3ae82977c6795971c058e1 100755 (executable)
--- 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:3d46efbf5fced8f73fd8e352902259aa0ba4c89fdf9fcbee24862044a09c56b8
-size 10505785
+oid sha256:01b1bf99d68a3849729b5af75db65bec86496bb43d46f54f6561d63a714de9c1
+size 10505773

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
index 545b59974b8d43dd68479e05717edd6426334df4..2c9a5b77053e1187284152941380261868ae28f6 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
@@ -601,8 +601,8 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
             {"CST",                 0,          "zh_CN",    Style.SPECIFIC_SHORT,
                 EnumSet.of(ParseOption.TZ_DATABASE_ABBREVIATIONS),  "Asia/Shanghai",    3,  TimeType.STANDARD},
 
-            {"EST",                 0,          "en_AU",    Style.SPECIFIC_SHORT,
-                EnumSet.of(ParseOption.TZ_DATABASE_ABBREVIATIONS),  "Australia/Sydney", 3,  TimeType.UNKNOWN},
+            {"AEST",                0,          "en_AU",    Style.SPECIFIC_SHORT,
+                EnumSet.of(ParseOption.TZ_DATABASE_ABBREVIATIONS),  "Australia/Sydney", 4,  TimeType.STANDARD},
 
             {"AST",                 0,          "ar_SA",    Style.SPECIFIC_SHORT,
                 EnumSet.of(ParseOption.TZ_DATABASE_ABBREVIATIONS),  "Asia/Riyadh",      3,  TimeType.STANDARD},
@@ -947,7 +947,7 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
                 "Australia/Sydney",
                 dateJan,
                 Style.SPECIFIC_SHORT,
-                "EST",
+                "AEDT",
                 TimeType.DAYLIGHT
             },
             {
@@ -955,7 +955,7 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
                 "Australia/Sydney",
                 dateJul,
                 Style.SPECIFIC_SHORT,
-                "EST",
+                "AEST",
                 TimeType.STANDARD
             },
         };