summaryrefslogtreecommitdiffstats
path: root/icu4c/source/data/misc/windowsZones.txt
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2020-04-24 10:46:36 +0100
committerKevin F. Haggerty <haggertk@lineageos.org>2020-05-01 09:12:24 -0600
commit8d16bec80c3695da9330d8733f11370d0a7afd5e (patch)
treeece1c8f47f87187c4b3052a20ae6cea7d3334b9e /icu4c/source/data/misc/windowsZones.txt
parent877982cfd60dd02d591eaad06d01020ace1c1cc7 (diff)
downloadandroid_external_icu-lineage-17.1.tar.gz
android_external_icu-lineage-17.1.tar.bz2
android_external_icu-lineage-17.1.zip
Update Android to tzdb 2020a [Q branch]lineage-17.1
This change is associated with tzdb 2020a changes in system/timezone. This change was generated using the CLDR patch from https://unicode-org.atlassian.net/browse/CLDR-13739 It was compared with the ICU patch from https://unicode-org.atlassian.net/browse/ICU-21094 Bug: 155047654 Test: ICU4C host tests (no new breakages) Test: ICU4J host tests (no breakages) Test: See associated system/timezone change Merged-In: I7102ef8296d3e11723c64e37f845f611e7ea47df Change-Id: I7102ef8296d3e11723c64e37f845f611e7ea47df (cherry picked from commit a3cdb6f78de45d071f93e8189e352d31a0138b24) (cherry picked from commit 0564416cf66e6b609880e7a608b9190939899aa6)
Diffstat (limited to 'icu4c/source/data/misc/windowsZones.txt')
-rw-r--r--icu4c/source/data/misc/windowsZones.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt
index cb139642f..66d3e88fb 100644
--- a/icu4c/source/data/misc/windowsZones.txt
+++ b/icu4c/source/data/misc/windowsZones.txt
@@ -466,7 +466,7 @@ windowsZones:table(nofallback){
}
"Pacific Standard Time"{
001{"America/Los_Angeles"}
- CA{"America/Vancouver America/Dawson America/Whitehorse"}
+ CA{"America/Vancouver"}
US{"America/Los_Angeles"}
ZZ{"PST8PDT"}
}
@@ -674,7 +674,10 @@ windowsZones:table(nofallback){
}
"US Mountain Standard Time"{
001{"America/Phoenix"}
- CA{"America/Dawson_Creek America/Creston America/Fort_Nelson"}
+ CA{
+ "America/Whitehorse America/Creston America/Dawson America/Dawson_Cre"
+ "ek America/Fort_Nelson"
+ }
MX{"America/Hermosillo"}
US{"America/Phoenix"}
ZZ{"Etc/GMT+7"}