diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-07 22:02:14 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-07 22:02:14 +0000 |
| commit | 7d24b8a6ac9f91d5b0c8d822cdfe795cff787de4 (patch) | |
| tree | 9f7508a41fff7fb9fdafbf4c2df729e0be3ff39c | |
| parent | 65497f02218f387796cebe813e780a39656f6e31 (diff) | |
| parent | 27f55e8236e33b3cf9342e59e345227b93142b99 (diff) | |
| download | icu-android11-d2-release.tar.gz | |
Snap for 7266183 from 27f55e8236e33b3cf9342e59e345227b93142b99 to rvc-d2-releaseandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r45android-11.0.0_r44android-11.0.0_r42android-11.0.0_r41android11-d2-release
Change-Id: Ia9821cee52e294a38a4e1f2c07f34875ae3e4022
| -rw-r--r-- | icu4c/source/data/misc/metaZones.txt | 5 | ||||
| -rw-r--r-- | icu4c/source/data/misc/windowsZones.txt | 2 | ||||
| -rw-r--r-- | icu4c/source/data/misc/zoneinfo64.txt | 10 | ||||
| -rw-r--r-- | icu4c/source/stubdata/icudt66l.dat | bin | 25164640 -> 25164688 bytes | |||
| -rw-r--r-- | icu4j/main/shared/data/icutzdata.jar | bin | 95028 -> 95063 bytes |
5 files changed, 11 insertions, 6 deletions
diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index c83e374af..e85a93008 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -894,6 +894,11 @@ metaZones:table(nofallback){ { "Africa_Eastern", "2000-01-15 10:00", + "2021-01-31 21:00", + } + { + "Africa_Central", + "2021-01-31 21:00", "9999-12-31 23:59", } } diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index 96af59813..c6c48a659 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -212,7 +212,6 @@ windowsZones:table(nofallback){ KM{"Indian/Comoro"} MG{"Indian/Antananarivo"} SO{"Africa/Mogadishu"} - SS{"Africa/Juba"} TZ{"Africa/Dar_es_Salaam"} UG{"Africa/Kampala"} YT{"Indian/Mayotte"} @@ -609,6 +608,7 @@ windowsZones:table(nofallback){ MW{"Africa/Blantyre"} MZ{"Africa/Maputo"} RW{"Africa/Kigali"} + SS{"Africa/Juba"} SZ{"Africa/Mbabane"} ZA{"Africa/Johannesburg"} ZM{"Africa/Lusaka"} diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index efa1c8583..b3683900d 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,9 +3,9 @@ // License & terms of use: http://www.unicode.org/copyright.html#License //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Mon Jan 11 19:45:09 2021 +// Build date: Fri Jan 29 11:12:08 2021 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2020f +// tz version: 2021a // ICU version: 66.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << @@ -13,7 +13,7 @@ //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2020f" } + TZVersion { "2021a" } Zones:array { /* ACT */ :int { 356 } //Z#0 /* AET */ :int { 368 } //Z#1 @@ -95,9 +95,9 @@ zoneinfo64:table(nofallback) { links:intvector { 30, 44, 45 } } //Z#30 /* Africa/Juba */ :table { - trans:intvector { -1230775588, 10360800, 24786000, 41810400, 56322000, 73432800, 87944400, 104882400, 119480400, 136332000, 151016400, 167781600, 182552400, 199231200, 214174800, 230680800, 245710800, 262735200, 277246800, 294184800, 308782800, 325634400, 340405200, 357084000, 371941200, 388533600, 403477200, 419983200, 435013200, 452037600, 466635600, 483487200, 498171600, 947930400 } + trans:intvector { -1230775588, 10360800, 24786000, 41810400, 56322000, 73432800, 87944400, 104882400, 119480400, 136332000, 151016400, 167781600, 182552400, 199231200, 214174800, 230680800, 245710800, 262735200, 277246800, 294184800, 308782800, 325634400, 340405200, 357084000, 371941200, 388533600, 403477200, 419983200, 435013200, 452037600, 466635600, 483487200, 498171600, 947930400, 1612126800 } typeOffsets:intvector { 7588, 0, 7200, 0, 7200, 3600, 10800, 0 } - typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020103" } + typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010301" } } //Z#31 /* Africa/Kampala */ :int { 48 } //Z#32 /* Africa/Khartoum */ :table { diff --git a/icu4c/source/stubdata/icudt66l.dat b/icu4c/source/stubdata/icudt66l.dat Binary files differindex 8f4bad99d..e74303527 100644 --- a/icu4c/source/stubdata/icudt66l.dat +++ b/icu4c/source/stubdata/icudt66l.dat diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar Binary files differindex 8d12e2fa0..47df1b14c 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar |