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/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 57eeebe..8491e38 100644
--- a/input_data/android/countryzones.txt
+++ b/input_data/android/countryzones.txt
@@ -25,7 +25,7 @@
# a time zone for an Android device.
# ianaVersion: The version of the IANA rules this file matches.
-ianaVersion:"2020f"
+ianaVersion:"2020d"
# countries:
#
@@ -388,6 +388,12 @@
>
timeZoneMappings:<
utcOffset:"10:00"
+ id:"Australia/Currie"
+ # < 1K
+ priority:1
+ >
+ timeZoneMappings:<
+ utcOffset:"10:00"
id:"Australia/Lindeman"
# Unknown
priority:1
@@ -2775,6 +2781,12 @@
priority:2520
>
timeZoneMappings:<
+ utcOffset:"4:00"
+ id:"Europe/Volgograd"
+ # 2.61M
+ priority:2610
+ >
+ timeZoneMappings:<
utcOffset:"3:00"
id:"Europe/Moscow"
# 7.10M
@@ -2782,12 +2794,6 @@
>
timeZoneMappings:<
utcOffset:"3:00"
- id:"Europe/Volgograd"
- # 2.61M
- priority:2610
- >
- timeZoneMappings:<
- utcOffset:"3:00"
id:"Europe/Kirov"
# 474K
priority:474
diff --git a/input_data/iana/tzdata2020d.tar.gz b/input_data/iana/tzdata2020d.tar.gz
new file mode 100644
index 0000000..934ffae
--- /dev/null
+++ b/input_data/iana/tzdata2020d.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2020d.tar.gz.asc b/input_data/iana/tzdata2020d.tar.gz.asc
new file mode 100644
index 0000000..a34ebf8
--- /dev/null
+++ b/input_data/iana/tzdata2020d.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl+QfYEACgkQ7ZfpDmKq
+fjR5wxAAjzC37QyQyyLS3GePbM3GAY0kDf40ieCHU9LBEBqTDXFbC8WaMCc+3jQ+
++iaFJbjK6iJeaZLr+y9ea+W47fKmBd0ogW6mR11HiJdmGKncPze1O9aae/thT2UJ
+KG3FIZYE5hERkyeNMHjwUJqVKcrg5VaE0iuUOlGrwpnNwPQl80zyRWhi0RbMomHR
+XD7jvMwpTy+x7lEWXA7WLUcxHwY3ezdMjPOwX+9EAVMMNCNEgRSaeBFIo9z3YUnc
+ppMnQ537TqfvmdvslDc+c6AXI2PqwHBQSluWMNUJHnC8KXdwFB+G2LJRdov7WqdU
++dnUKZsGwMxPHqgbNpINf4q48tIg6xEDVXH12973EV1Rh4Tao0g4l18WpFOCXqeI
+/vNETZHkcqNkhpMb5XI289LU3Mc889RjEjwhpKJv0RN+bw5sRvgftY8j/Vp1Jty0
+gHpCA3M1YRglq0SBpfsWpXJsz3T1EcRdT5XToTpG321OsRoymjZ7txqF5siAiWBo
+P7zGgBe+0mIZ3bSDI/o1a/yuL0jwjTru2SbC6B9maOZXw2iPzEB6j8grFLmsUj7u
+e/s5jaqYrPTD8PsvBO1r20sP2HwQHhvew+TemVhSuW0yfqifffx0ybwZrw6oF0Ig
+SEPdSJkwsiOu7U/cKIFuClsZUaiOjjWu9SMWKUNm6AHXpO8CuCk=
+=48vS
+-----END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2020f.tar.gz b/input_data/iana/tzdata2020f.tar.gz
deleted file mode 100644
index 9bea3b9..0000000
--- a/input_data/iana/tzdata2020f.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2020f.tar.gz.asc b/input_data/iana/tzdata2020f.tar.gz.asc
deleted file mode 100644
index ba73f79..0000000
--- a/input_data/iana/tzdata2020f.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl/q5ukACgkQ7ZfpDmKq
-fjQ8ug//WH7DpYFvSYMKpSj6gG0m5lK0JXcs062EKGQNsVoUjSVImu3VPbpUS9tu
-cO3NCUmeqTmwhUOuZQN2qGAT2KyNhcLTlza8xuRQm/tJ7SYpArseY9rudQtkjbCi
-uWELQi5+a6CA/PBBRJzDJwQPTf4wDZr24vDd29tKqBho5T5cisudXHhqh1Bm0Bfr
-NPyPsS6+oLJofIVsU0I5V+fbnU98ny5I1r/OyVIJgAlvEcb0kMDr0fBfu1dNvJI9
-Tyl3kvdLSMCgf/lRXEFYJpI0RuUeIAsOvHaSwSCHKGc7FHzgDiK1U5D/4z5Ipo02
-0AQKkLFkEbzwou/5KtX2Q3+yba1AGu64C7elu+aKepUNGhkzAaJrl2xNNM25Sdn4
-1WvxOt43GTIze0cr9UHm942sU5UxH0ahv4h9pEbqJ44UVzBhuDDqcMXYJEWhdhMf
-6dgRA7SJThuX7tN758to9Ze9XyXMdzAPdJKs/wyLrRGyDq0dXlRTVPL4Nk9ZqRQh
-FYJlOhM2TGSg7VsNgn8gneODaaQJpJ7jVSIwicQtWES2K2oblrFz4LSeXm39xZDc
-0JRNh/fSeRygCGrjD7CLqq88UGTxhEuZbEXKXSPMLC+7j7JF/CmCVj8HjNw8M3Cy
-uk/Tfamala66AGltxPwKchTPBJH8F4tZy+4krfYXByoIX5h+Ta4=
-=Fk0g
------END PGP SIGNATURE-----
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
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index df1b274..951c87b 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -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/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index c2c0939..0201aa2 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index 982672f..231ab4a 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
index 7eaa126..3ba47a2 100644
--- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test2/output_data/android/tzlookup.xml b/testing/data/test2/output_data/android/tzlookup.xml
index 009e535..841f35b 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -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/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 5adba8c..9ac93a2 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test2/output_data/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index 41d6ec6..6140cf2 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
index 92c4571..8d2f119 100644
--- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml
index df1b274..951c87b 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -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/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index c37bec0..2d369c1 100644
--- a/testing/data/test3/output_data/distro/distro.zip
+++ b/testing/data/test3/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index 982672f..231ab4a 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
index a72a8c9..063cb1e 100644
--- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
Binary files differ