diff options
| author | Neil Fuller <nfuller@google.com> | 2018-03-28 16:59:16 +0100 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-10-23 19:54:16 -0600 |
| commit | 4760fb8431bbd8bc46e4fb9ffc0548910a85f1fa (patch) | |
| tree | 7615a1b6f1e618d0a45604d0523352c0235bd48d /icu4c/source/data/misc/windowsZones.txt | |
| parent | 9d527343392e718877cfe6a99138b97e5e19a46a (diff) | |
| download | android_external_icu-4760fb8431bbd8bc46e4fb9ffc0548910a85f1fa.tar.gz android_external_icu-4760fb8431bbd8bc46e4fb9ffc0548910a85f1fa.tar.bz2 android_external_icu-4760fb8431bbd8bc46e4fb9ffc0548910a85f1fa.zip | |
DO NOT MERGE: Update ICU data to 2018d
This change tracks a related change in system/timezone
It picks up all changes associated with the ICU
2018d update:
http://bugs.icu-project.org/trac/ticket/13666
This commit also contains changes not directly related to 2018d but
which look reasonable: specifically, the change to modify the
ISO code for America/Curacao from here:
http://bugs.icu-project.org/trac/changeset/40980/trunk/icu4c/source/data/misc/metaZones.txt
And other changes to windowsZones.txt from here:
http://bugs.icu-project.org/trac/changeset/40980/trunk/icu4c/source/data/misc/windowsZones.txt
Bug: 76260495
Bug: 76346996
Test: Ran ICU4C and ICU4J host tests
Change-Id: I2d2d2a7030db28b9012722ea453c7d21b2046d6e
(cherry picked from commit 75fd3237eeb7ab4d09afeffc0d58a798ed64b763)
Diffstat (limited to 'icu4c/source/data/misc/windowsZones.txt')
| -rw-r--r-- | icu4c/source/data/misc/windowsZones.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index 76349ae70..c59fc6743 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -156,7 +156,6 @@ windowsZones:table(nofallback){ } "Central Pacific Standard Time"{ 001{"Pacific/Guadalcanal"} - AQ{"Antarctica/Casey"} AU{"Antarctica/Macquarie"} FM{"Pacific/Ponape Pacific/Kosrae"} NC{"Pacific/Noumea"} @@ -212,7 +211,6 @@ windowsZones:table(nofallback){ KE{"Africa/Nairobi"} KM{"Indian/Comoro"} MG{"Indian/Antananarivo"} - SD{"Africa/Khartoum"} SO{"Africa/Mogadishu"} SS{"Africa/Juba"} TZ{"Africa/Dar_es_Salaam"} @@ -606,6 +604,10 @@ windowsZones:table(nofallback){ 001{"Asia/Colombo"} LK{"Asia/Colombo"} } + "Sudan Standard Time"{ + 001{"Africa/Khartoum"} + SD{"Africa/Khartoum"} + } "Syria Standard Time"{ 001{"Asia/Damascus"} SY{"Asia/Damascus"} @@ -717,6 +719,7 @@ windowsZones:table(nofallback){ } "W. Australia Standard Time"{ 001{"Australia/Perth"} + AQ{"Antarctica/Casey"} AU{"Australia/Perth"} } "W. Central Africa Standard Time"{ |