diff options
| author | Neil Fuller <nfuller@google.com> | 2018-01-24 18:16:05 +0000 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-10-23 19:54:15 -0600 |
| commit | ad507c322e0d6ee8d9fa735b5068fbda7f528d68 (patch) | |
| tree | 26dc96d9246e8168e621f1ec462f125af566c842 /icu4c/source/data/misc/windowsZones.txt | |
| parent | 8486332b5ba31f0ab86b06421d16270ccada1813 (diff) | |
| download | android_external_icu-ad507c322e0d6ee8d9fa735b5068fbda7f528d68.tar.gz android_external_icu-ad507c322e0d6ee8d9fa735b5068fbda7f528d68.tar.bz2 android_external_icu-ad507c322e0d6ee8d9fa735b5068fbda7f528d68.zip | |
DO NOT MERGE: ICU changes for 2018a/b/c
This change is for O-MR1 only.
This change contains updates from changesets:
40787 (2018a)
40794 (2018b)
40798 (2018c)
The following files were regenerated using
system/timezone/update-tzdata.py:
icu4c/source/data/misc/zoneinfo64.txt
icu4c/source/stubdata/icudt60l.dat
icu4j/main/shared/data/icudata.jar
icu4j/main/shared/data/icutzdata.jar
See also changes in system/timezone.
Test: Ran icu4c tests / icu4j tests
Test: CTS: run -m CtsIcuTestCases
Bug: 72484062
Change-Id: Ia109dbdb2044343d82ce021f9066febf4454a311
(cherry picked from commit 844a1e96be05c2813d380eeb81bc94321f985377)
Diffstat (limited to 'icu4c/source/data/misc/windowsZones.txt')
| -rw-r--r-- | icu4c/source/data/misc/windowsZones.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index fdad2a665..76349ae70 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -316,7 +316,6 @@ windowsZones:table(nofallback){ SH{"Atlantic/St_Helena"} SL{"Africa/Freetown"} SN{"Africa/Dakar"} - ST{"Africa/Sao_Tome"} TG{"Africa/Lome"} } "Haiti Standard Time"{ @@ -733,6 +732,7 @@ windowsZones:table(nofallback){ GQ{"Africa/Malabo"} NE{"Africa/Niamey"} NG{"Africa/Lagos"} + ST{"Africa/Sao_Tome"} TD{"Africa/Ndjamena"} TN{"Africa/Tunis"} ZZ{"Etc/GMT-1"} |