From cf7b342a1da13a7f40cdbe18ed1cdc9560939648 Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Thu, 14 Sep 2017 19:57:27 +0000
Subject: [PATCH] ICU-13312 Added tzdb metazone entry for Pyongyang, and
 generated ICU4J data with the change. Fixed one data issue in tzdbNames -
 metazone names CST/CDT for Taipei are not unique, and need to add
 parseRegions data to restrict that the parse mapping should be only used when
 locale's region is TW.

X-SVN-Rev: 40416
---
 icu4c/source/data/zone/tzdbNames.txt | 7 ++++++-
 icu4j/main/shared/data/icudata.jar   | 4 ++--
 icu4j/main/shared/data/icutzdata.jar | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/icu4c/source/data/zone/tzdbNames.txt b/icu4c/source/data/zone/tzdbNames.txt
index a68754b9226..e220d33ee21 100644
--- a/icu4c/source/data/zone/tzdbNames.txt
+++ b/icu4c/source/data/zone/tzdbNames.txt
@@ -201,7 +201,7 @@ tzdbNames{
         "meta:China"{
             sd{"CDT"}
             ss{"CST"}
-            parseRegions{"CN", "MO", "TW"}
+            parseRegions{"CN", "MO"}
         }
         "meta:Choibalsan"{
             sd{"CHOST"}
@@ -562,6 +562,10 @@ tzdbNames{
         "meta:Ponape"{
             ss{"PONT"}
         }
+        "meta:Pyongyang"{
+            ss{"KST"}
+            parseRegions{"KP"}
+        }
         "meta:Qyzylorda"{
             sd{"QYZST"}
             ss{"QYZT"}
@@ -617,6 +621,7 @@ tzdbNames{
         "meta:Taipei"{
             sd{"CDT"}
             ss{"CST"}
+            parseRegions{"TW"}
         }
         "meta:Tajikistan"{
             ss{"TJT"}
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 30a878de142..0beadd2cdc2 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:36b9c089da215705724fac836c41e0db1922f8ea85bf734c601f70fc623187ad
-size 12226253
+oid sha256:e8f0af1c8a7b33d8ff22dea3143ecde79291218f0cea9b18181d3fdbd462c2fb
+size 12226267
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index e1a748a3526..bfed0fe603e 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:ca79a3355cea5666551889ce8ff3703987162a35937a292d80284519f2b68286
+oid sha256:acb00f0af330fbce209ffc15f9af2368edda40ced40f1b3367f040063f6e268a
 size 92486
-- 
2.40.0