Revert "RESTRICT AUTOMERGE Update Android TZDB from 2020d to 202..."
Revert "DO NOT MERGE Cherry-pick CLDR-14373: Update Android CLDR..."
Revert "DO NOT MERGE Cherry-pick ICU-21448: Update Android ICU t..."
Revert submission 13948646-tzdb2020f_rvc-qpr-dev
Reason for revert: code should not be changed in non-master branch.
I will CP clean 2020f change after that(the same way it was done in
rvc-timezone-dev)
Reverted Changes:
If2aa9fb7b:RESTRICT AUTOMERGE Update Android TZDB from 2020d ...
Ief4b2b0ee:DO NOT MERGE Cherry-pick CLDR-14373: Update Androi...
Idb22a1639:DO NOT MERGE Cherry-pick ICU-21448: Update Android...
Bug: 183389264
Change-Id: I287cb1c7531f67a5477907243da3ba296a51f0e3
Merged-In: Ibfb0643d5fd6d9ddaff6bdf99f3d56eb28786b19
Merged-In: Ie0b590c1fe0aa4a07f80587d8ddc37266b2e8111
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 78664ca..ad1bf62 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
**** Autogenerated file - DO NOT EDIT ****
---><timezones ianaversion="2020f">
+--><timezones ianaversion="2020d">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -65,6 +65,7 @@
<id notafter="796147200000">Australia/Melbourne</id>
<id>Australia/Brisbane</id>
<id notafter="1193500800000">Australia/Hobart</id>
+ <id notafter="37728000000">Australia/Currie</id>
<id notafter="762883200000">Australia/Lindeman</id>
<id notafter="1286035200000">Antarctica/Macquarie</id>
<id>Australia/Lord_Howe</id>
@@ -710,8 +711,8 @@
<id notafter="701823600000">Europe/Astrakhan</id>
<id notafter="1480806000000">Europe/Ulyanovsk</id>
<id>Europe/Saratov</id>
- <id>Europe/Moscow</id>
<id>Europe/Volgograd</id>
+ <id>Europe/Moscow</id>
<id>Europe/Kirov</id>
<id>Europe/Kaliningrad</id>
</country>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 9441742..2bd2144 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
Binary files differ
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index f0948ba..cb45b2f 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
Binary files differ
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index eb590a4..c75e5b5 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/output_data/version/tz_version b/output_data/version/tz_version
index 36055ff..d503456 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-004.001|2020f|001
\ No newline at end of file
+004.001|2020d|001
\ No newline at end of file