commit bb811d16af49921e69cb72b01485544b64bc1eb6
author Xin Li <delphij@google.com> Mon Aug 28 21:45:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 28 21:45:47 2017 +0000
tree bbba2214675eb31628b7d438a01b48d11879dddd
parent 0f5b8ca7d51650605c3ca1d41bf5094e53c3d844
parent 594f733bc6f74b46ec483d875d23e0c3d1c4ecea

Merge nougat-cts-dev revision e34e3b07f3a46c7e7494371f25ebe59f8986c936 into nougat-mr1-cts-dev.
am: 594f733bc6

Change-Id: I47fac0275f9604daee4bf916606f9b3b842464fe

android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java

diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
index 2612b00..1ce2b7c 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
@@ -2252,7 +2252,9 @@
             {"America/Indianapolis",    "US Eastern Standard Time"},            // CLDR canonical name
             {"America/Indiana/Indianapolis",    "US Eastern Standard Time"},    // tzdb canonical name
             {"Asia/Khandyga",           "Yakutsk Standard Time"},
-            {"Australia/Eucla",         null}, // No Windows ID mapping
+            // Android-changed: Removed this case because CLDR 30 now has a mapping and some OEMs
+            // have picked up the windowsZone.txt change. http://b/32534123 & http://b/32512035.
+            // {"Australia/Eucla",         null}, // No Windows ID mapping
             {"Bogus",                   null},
         };
 

icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
index bac70b5..01c257c 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
@@ -2248,7 +2248,9 @@
             {"America/Indianapolis",    "US Eastern Standard Time"},            // CLDR canonical name
             {"America/Indiana/Indianapolis",    "US Eastern Standard Time"},    // tzdb canonical name
             {"Asia/Khandyga",           "Yakutsk Standard Time"},
-            {"Australia/Eucla",         null}, // No Windows ID mapping
+            // Android-changed: Removed this case because CLDR 30 now has a mapping and some OEMs
+            // have picked up the windowsZone.txt change. http://b/32534123 & http://b/32512035.
+            // {"Australia/Eucla",         null}, // No Windows ID mapping
             {"Bogus",                   null},
         };