diff options
| author | Almaz Mingaleev <mingaleev@google.com> | 2024-02-12 11:43:53 +0000 |
|---|---|---|
| committer | Almaz Mingaleev <mingaleev@google.com> | 2024-02-13 18:04:38 +0000 |
| commit | 0835b2d4ff53eb7f5af01e5fdb9b70c7e2dfcb4f (patch) | |
| tree | c11c7c9bbba97aa320b0a7bc558e44fb545e5eb7 /common/supplemental/windowsZones.xml | |
| parent | 90048afe2ded09920727ea4dcbc459ba79ac63c7 (diff) | |
| download | cldr-0835b2d4ff53eb7f5af01e5fdb9b70c7e2dfcb4f.tar.gz | |
DO NOT MERGE Update Android CLDR data from 2023a to 2023d. [R]
Unlike S 2023d change, only one commit is picked. That's because
taking entire list leads to unwanted changes (see the bug). Taking
subset of these changes causes tests to fail. So here, in an older
branch, only 2023d changes (Greenland and Antarctica) are picked.
Bug: 324364476
Test: see system/timezone
CLDR-17295 tz2023d updates and deprecated zone/metazone cleanup
(cherry picked from commit 2bbdb3de2a0985261ec31d0864f08ab82eaa9617)
Change-Id: I7b4e7118c3b9ca8c9d88b126b9addc51a263df3a
Merged-In: I7b4e7118c3b9ca8c9d88b126b9addc51a263df3a
Diffstat (limited to 'common/supplemental/windowsZones.xml')
| -rw-r--r-- | common/supplemental/windowsZones.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/supplemental/windowsZones.xml b/common/supplemental/windowsZones.xml index fd2ccb6d..39b9dd57 100644 --- a/common/supplemental/windowsZones.xml +++ b/common/supplemental/windowsZones.xml @@ -266,9 +266,8 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="Cape Verde Standard Time" territory="ZZ" type="Etc/GMT+1"/> <!-- (UTC) Coordinated Universal Time --> - <mapZone other="UTC" territory="001" type="Etc/GMT"/> - <mapZone other="UTC" territory="GL" type="America/Danmarkshavn"/> - <mapZone other="UTC" territory="ZZ" type="Etc/GMT Etc/UTC"/> + <mapZone other="UTC" territory="001" type="Etc/UTC"/> + <mapZone other="UTC" territory="ZZ" type="Etc/UTC Etc/GMT"/> <!-- (UTC+00:00) Dublin, Edinburgh, Lisbon, London --> <mapZone other="GMT Standard Time" territory="001" type="Europe/London"/> @@ -286,6 +285,7 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="Greenwich Standard Time" territory="BF" type="Africa/Ouagadougou"/> <mapZone other="Greenwich Standard Time" territory="CI" type="Africa/Abidjan"/> <mapZone other="Greenwich Standard Time" territory="GH" type="Africa/Accra"/> + <mapZone other="Greenwich Standard Time" territory="GL" type="America/Danmarkshavn"/> <mapZone other="Greenwich Standard Time" territory="GM" type="Africa/Banjul"/> <mapZone other="Greenwich Standard Time" territory="GN" type="Africa/Conakry"/> <mapZone other="Greenwich Standard Time" territory="GW" type="Africa/Bissau"/> |