From 5f7178754de1d8d2fefb5d669fc9b4d6a3b9da6c Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Thu, 4 Sep 2014 15:36:37 +0000
Subject: [PATCH] ICU-10898 tzdata2014g updates in ICU4J

X-SVN-Rev: 36343
---
 icu4j/main/shared/data/icutzdata.jar          |  4 +--
 .../icu/dev/test/timezone/TimeZoneTest.java   | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 0997a68164f..a98a36d0f44 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:46bc97210b0770c163d02d50a666623ef8571a0eb9c91303cd40df6fbcdab3b3
-size 90987
+oid sha256:fec7343c363e6c663af13de797326aa9c98a6ba29777adac0634aaf832ff6052
+size 90808
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 ea6d21a3a5d..37e84ca800f 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
@@ -1477,25 +1477,33 @@ public class TimeZoneTest extends TestFmwk
         final String[][] excluded1 = {
                 {"Africa/Bamako", "Africa/Abidjan"},
                 {"Africa/Banjul", "Africa/Abidjan"},
+                {"Africa/Brazzaville", "Africa/Bangui"},
                 {"Africa/Conakry", "Africa/Abidjan"},
                 {"Africa/Dakar", "Africa/Abidjan"},
+                {"Africa/Douala", "Africa/Bangui"},
                 {"Africa/Freetown", "Africa/Abidjan"},
                 {"Africa/Khartoum", "Africa/Juba"},
+                {"Africa/Kinshasa", "Africa/Bangui"},
+                {"Africa/Lagos", "Africa/Bangui"},
+                {"Africa/Libreville", "Africa/Bangui"},
                 {"Africa/Lome", "Africa/Abidjan"},
+                {"Africa/Luanda", "Africa/Bangui"},
+                {"Africa/Malabo", "Africa/Bangui"},
+                {"Africa/Niamey", "Africa/Bangui"},
                 {"Africa/Nouakchott", "Africa/Abidjan"},
                 {"Africa/Ouagadougou", "Africa/Abidjan"},
+                {"Africa/Porto-Novo", "Africa/Bangui"},
                 {"Africa/Sao_Tome", "Africa/Abidjan"},
-                {"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
-                {"America/Kralendijk", "America/Curacao"},
-                {"America/Lower_Princes", "America/Curacao"},
-                {"America/Marigot", "America/Guadeloupe"},
-                {"America/St_Barthelemy", "America/Guadeloupe"},
+                {"America/Curacao", "America/Aruba"},
                 {"America/Dominica", "America/Anguilla"},
                 {"America/Grenada", "America/Anguilla"},
                 {"America/Guadeloupe", "America/Anguilla"},
+                {"America/Kralendijk", "America/Aruba"},
+                {"America/Lower_Princes", "America/Aruba"},
                 {"America/Marigot", "America/Anguilla"},
                 {"America/Montserrat", "America/Anguilla"},
                 {"America/Port_of_Spain", "America/Anguilla"},
+                {"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
                 {"America/St_Barthelemy", "America/Anguilla"},
                 {"America/St_Kitts", "America/Anguilla"},
                 {"America/St_Lucia", "America/Anguilla"},
@@ -1503,27 +1511,24 @@ public class TimeZoneTest extends TestFmwk
                 {"America/St_Vincent", "America/Anguilla"},
                 {"America/Tortola", "America/Anguilla"},
                 {"America/Virgin", "America/Anguilla"},
-                {"America/Curacao", "America/Aruba"},
-                {"America/Kralendijk", "America/Aruba"},
-                {"America/Lower_Princes", "America/Aruba"},
                 {"Antarctica/South_Pole", "Antarctica/McMurdo"},
+                {"Arctic/Longyearbyen", "Europe/Oslo"},
                 {"Atlantic/Jan_Mayen", "Europe/Oslo"},
                 {"Atlantic/St_Helena", "Africa/Abidjan"},
-                {"Arctic/Longyearbyen", "Europe/Oslo"},
+                {"Europe/Bratislava", "Europe/Prague"},
                 {"Europe/Busingen", "Europe/Zurich"},
                 {"Europe/Guernsey", "Europe/London"},
                 {"Europe/Isle_of_Man", "Europe/London"},
                 {"Europe/Jersey", "Europe/London"},
                 {"Europe/Ljubljana", "Europe/Belgrade"},
+                {"Europe/Mariehamn", "Europe/Helsinki"},
                 {"Europe/Podgorica", "Europe/Belgrade"},
+                {"Europe/San_Marino", "Europe/Rome"},
                 {"Europe/Sarajevo", "Europe/Belgrade"},
                 {"Europe/Skopje", "Europe/Belgrade"},
-                {"Europe/Zagreb", "Europe/Belgrade"},
-                {"Europe/Bratislava", "Europe/Prague"},
-                {"Europe/Mariehamn", "Europe/Helsinki"},
-                {"Europe/San_Marino", "Europe/Rome"},
-                {"Europe/Vatican", "Europe/Rome"},
                 {"Europe/Vaduz", "Europe/Zurich"},
+                {"Europe/Vatican", "Europe/Rome"},
+                {"Europe/Zagreb", "Europe/Belgrade"},
                 {"Pacific/Auckland", "Antarctica/McMurdo"},
                 {"Pacific/Johnston", "Pacific/Honolulu"},
         };
-- 
2.40.0