Merge cherrypicks of ['googleplex-android-review.googlesource.com/26226319'] into sparse-11296643-L88600030002056189.
SPARSE_CHANGE: I228d5991c685a35989f7c0fccb6647afb938520e
Change-Id: If80494a0b0f1058f6fec08bb149a4554f2f2d060
diff --git a/ojluni/src/test/java/time/test/java/time/format/TestUnicodeExtension.java b/ojluni/src/test/java/time/test/java/time/format/TestUnicodeExtension.java
index bfe9f16..4d51f0b 100644
--- a/ojluni/src/test/java/time/test/java/time/format/TestUnicodeExtension.java
+++ b/ojluni/src/test/java/time/test/java/time/format/TestUnicodeExtension.java
@@ -405,7 +405,6 @@
{"audrw", "Australia/Darwin"},
{"aueuc", "Australia/Eucla"},
{"auhba", "Australia/Hobart"},
- {"aukns", "Australia/Currie"},
{"auldc", "Australia/Lindeman"},
{"auldh", "Australia/Lord_Howe"},
{"aumel", "Australia/Melbourne"},
@@ -450,19 +449,15 @@
{"bzbze", "America/Belize"},
{"cacfq", "America/Creston"},
{"caedm", "America/Edmonton"},
- {"caffs", "America/Rainy_River"},
{"cafne", "America/Fort_Nelson"},
{"caglb", "America/Glace_Bay"},
{"cagoo", "America/Goose_Bay"},
{"cahal", "America/Halifax"},
{"caiql", "America/Iqaluit"},
{"camon", "America/Moncton"},
- {"capnt", "America/Pangnirtung"},
{"careb", "America/Resolute"},
{"careg", "America/Regina"},
{"casjf", "America/St_Johns"},
- {"canpg", "America/Nipigon"},
- {"cathu", "America/Thunder_Bay"},
{"cator", "America/Toronto"},
{"cavan", "America/Vancouver"},
{"cawnp", "America/Winnipeg"},
@@ -474,7 +469,6 @@
{"cayev", "America/Inuvik"},
{"cayxy", "America/Whitehorse"},
{"cayyn", "America/Swift_Current"},
- {"cayzf", "America/Yellowknife"},
{"cayzs", "America/Coral_Harbour"},
{"cccck", "Indian/Cocos"},
{"cdfbm", "Africa/Lubumbashi"},
@@ -633,7 +627,6 @@
{"mxmzt", "America/Mazatlan"},
{"mxoji", "America/Ojinaga"},
{"mxpvr", "America/Bahia_Banderas"},
- {"mxstis", "America/Santa_Isabel"},
{"mxtij", "America/Tijuana"},
{"mykch", "Asia/Kuching"},
{"mykul", "Asia/Kuala_Lumpur"},
@@ -734,12 +727,9 @@
{"twtpe", "Asia/Taipei"},
{"tzdar", "Africa/Dar_es_Salaam"},
{"uaiev", "Europe/Kiev"},
- {"uaozh", "Europe/Zaporozhye"},
{"uasip", "Europe/Simferopol"},
- {"uauzh", "Europe/Uzhgorod"},
{"ugkla", "Africa/Kampala"},
{"umawk", "Pacific/Wake"},
- {"umjon", "Pacific/Johnston"},
{"ummdy", "Pacific/Midway"},
// {"unk", "Etc/Unknown"},
{"usadk", "America/Adak"},
