Update Android TZDB from 2020d to 2020f. am: b85cbdff44
Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1544289
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia627f10a6891cd6c4a02a62f350fa5764389e797
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index f23401e..1ceaad6 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:"2020d"
+ianaVersion:"2020f"
# countries:
#
@@ -402,12 +402,6 @@
>
timeZoneMappings:<
utcOffset:"10:00"
- id:"Australia/Currie"
- # < 1K
- priority:1
- >
- timeZoneMappings:<
- utcOffset:"10:00"
id:"Australia/Brisbane"
# 2.36M
priority:2360
@@ -2802,12 +2796,6 @@
priority:1010
>
timeZoneMappings:<
- utcOffset:"4:00"
- id:"Europe/Volgograd"
- # 2.61M
- priority:2610
- >
- timeZoneMappings:<
utcOffset:"3:00"
id:"Europe/Moscow"
# 7.10M
@@ -2815,6 +2803,12 @@
>
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
deleted file mode 100644
index 934ffae..0000000
--- a/input_data/iana/tzdata2020d.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2020d.tar.gz.asc b/input_data/iana/tzdata2020d.tar.gz.asc
deleted file mode 100644
index a34ebf8..0000000
--- a/input_data/iana/tzdata2020d.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------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
new file mode 100644
index 0000000..9bea3b9
--- /dev/null
+++ b/input_data/iana/tzdata2020f.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2020f.tar.gz.asc b/input_data/iana/tzdata2020f.tar.gz.asc
new file mode 100644
index 0000000..ba73f79
--- /dev/null
+++ b/input_data/iana/tzdata2020f.tar.gz.asc
@@ -0,0 +1,16 @@
+-----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/tzids.prototxt b/output_data/android/tzids.prototxt
index 9030977..9ca4854 100644
--- a/output_data/android/tzids.prototxt
+++ b/output_data/android/tzids.prototxt
@@ -1,5 +1,5 @@
# Autogenerated file - DO NOT EDIT.
-ianaVersion: "2020d"
+ianaVersion: "2020f"
countryMappings {
isoCode: "ad"
timeZoneIds: "Europe/Andorra"
@@ -170,6 +170,10 @@
preferredId: "Australia/Melbourne"
}
timeZoneLinks {
+ alternativeId: "Australia/Currie"
+ preferredId: "Australia/Hobart"
+ }
+ timeZoneLinks {
alternativeId: "Australia/Tasmania"
preferredId: "Australia/Hobart"
}
@@ -208,11 +212,6 @@
fromMillis: 1193500800000
}
timeZoneReplacements {
- replacedId: "Australia/Currie"
- replacementId: "Australia/Hobart"
- fromMillis: 37728000000
- }
- timeZoneReplacements {
replacedId: "Australia/Lindeman"
replacementId: "Australia/Brisbane"
fromMillis: 762883200000
@@ -1477,8 +1476,8 @@
timeZoneIds: "Asia/Yekaterinburg"
timeZoneIds: "Europe/Samara"
timeZoneIds: "Europe/Saratov"
- timeZoneIds: "Europe/Volgograd"
timeZoneIds: "Europe/Moscow"
+ timeZoneIds: "Europe/Volgograd"
timeZoneIds: "Europe/Kirov"
timeZoneIds: "Europe/Kaliningrad"
timeZoneLinks {
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index a41aee4..f76732b 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
**** Autogenerated file - DO NOT EDIT ****
---><timezones ianaversion="2020d">
+--><timezones ianaversion="2020f">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -63,8 +63,7 @@
<country code="au" default="Australia/Sydney" everutc="n">
<id alts="Australia/ACT,Australia/Canberra,Australia/NSW">Australia/Sydney</id>
<id notafter="796147200000" repl="Australia/Sydney" alts="Australia/Victoria">Australia/Melbourne</id>
- <id notafter="1193500800000" repl="Australia/Sydney" alts="Australia/Tasmania">Australia/Hobart</id>
- <id notafter="37728000000" repl="Australia/Hobart">Australia/Currie</id>
+ <id notafter="1193500800000" repl="Australia/Sydney" alts="Australia/Currie,Australia/Tasmania">Australia/Hobart</id>
<id alts="Australia/Queensland">Australia/Brisbane</id>
<id notafter="762883200000" repl="Australia/Brisbane">Australia/Lindeman</id>
<id notafter="1286035200000" repl="Australia/Sydney">Antarctica/Macquarie</id>
@@ -711,8 +710,8 @@
<id>Europe/Saratov</id>
<id notafter="1480806000000" repl="Europe/Saratov">Europe/Ulyanovsk</id>
<id notafter="701823600000" repl="Europe/Ulyanovsk">Europe/Astrakhan</id>
- <id>Europe/Volgograd</id>
<id alts="W-SU">Europe/Moscow</id>
+ <id>Europe/Volgograd</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 f6ec8fb..8704f22 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 075fb62..26d0239 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 c75e5b5..eb590a4 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 33807c5..288f916 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-005.001|2020d|001
\ No newline at end of file
+005.001|2020f|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 328ff79..be7170c 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -63,8 +63,7 @@
<country code="au" default="Australia/Sydney" everutc="n">
<id alts="Australia/ACT,Australia/Canberra,Australia/NSW">Australia/Sydney</id>
<id notafter="796147200000" repl="Australia/Sydney" alts="Australia/Victoria">Australia/Melbourne</id>
- <id notafter="1193500800000" repl="Australia/Sydney" alts="Australia/Tasmania">Australia/Hobart</id>
- <id notafter="37728000000" repl="Australia/Hobart">Australia/Currie</id>
+ <id notafter="1193500800000" repl="Australia/Sydney" alts="Australia/Currie,Australia/Tasmania">Australia/Hobart</id>
<id alts="Australia/Queensland">Australia/Brisbane</id>
<id notafter="762883200000" repl="Australia/Brisbane">Australia/Lindeman</id>
<id notafter="1286035200000" repl="Australia/Sydney">Antarctica/Macquarie</id>
@@ -711,8 +710,8 @@
<id>Europe/Saratov</id>
<id notafter="1480806000000" repl="Europe/Saratov">Europe/Ulyanovsk</id>
<id notafter="701823600000" repl="Europe/Ulyanovsk">Europe/Astrakhan</id>
- <id>Europe/Volgograd</id>
<id alts="W-SU">Europe/Moscow</id>
+ <id>Europe/Volgograd</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 a88c2c2..ab251b3 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 4d317d3..4c3e0bc 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 3ba47a2..7eaa126 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 f997f3f..04af3f9 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -63,8 +63,7 @@
<country code="au" default="Australia/Sydney" everutc="n">
<id alts="Australia/ACT,Australia/Canberra,Australia/NSW">Australia/Sydney</id>
<id notafter="796147200000" repl="Australia/Sydney" alts="Australia/Victoria">Australia/Melbourne</id>
- <id notafter="1193500800000" repl="Australia/Sydney" alts="Australia/Tasmania">Australia/Hobart</id>
- <id notafter="37728000000" repl="Australia/Hobart">Australia/Currie</id>
+ <id notafter="1193500800000" repl="Australia/Sydney" alts="Australia/Currie,Australia/Tasmania">Australia/Hobart</id>
<id alts="Australia/Queensland">Australia/Brisbane</id>
<id notafter="762883200000" repl="Australia/Brisbane">Australia/Lindeman</id>
<id notafter="1286035200000" repl="Australia/Sydney">Antarctica/Macquarie</id>
@@ -711,8 +710,8 @@
<id>Europe/Saratov</id>
<id notafter="1480806000000" repl="Europe/Saratov">Europe/Ulyanovsk</id>
<id notafter="701823600000" repl="Europe/Ulyanovsk">Europe/Astrakhan</id>
- <id>Europe/Volgograd</id>
<id alts="W-SU">Europe/Moscow</id>
+ <id>Europe/Volgograd</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 fdc0f4c..8ac6e76 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 e8d2bd6..04e9fd7 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 8d2f119..92c4571 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 328ff79..be7170c 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -63,8 +63,7 @@
<country code="au" default="Australia/Sydney" everutc="n">
<id alts="Australia/ACT,Australia/Canberra,Australia/NSW">Australia/Sydney</id>
<id notafter="796147200000" repl="Australia/Sydney" alts="Australia/Victoria">Australia/Melbourne</id>
- <id notafter="1193500800000" repl="Australia/Sydney" alts="Australia/Tasmania">Australia/Hobart</id>
- <id notafter="37728000000" repl="Australia/Hobart">Australia/Currie</id>
+ <id notafter="1193500800000" repl="Australia/Sydney" alts="Australia/Currie,Australia/Tasmania">Australia/Hobart</id>
<id alts="Australia/Queensland">Australia/Brisbane</id>
<id notafter="762883200000" repl="Australia/Brisbane">Australia/Lindeman</id>
<id notafter="1286035200000" repl="Australia/Sydney">Antarctica/Macquarie</id>
@@ -711,8 +710,8 @@
<id>Europe/Saratov</id>
<id notafter="1480806000000" repl="Europe/Saratov">Europe/Ulyanovsk</id>
<id notafter="701823600000" repl="Europe/Ulyanovsk">Europe/Astrakhan</id>
- <id>Europe/Volgograd</id>
<id alts="W-SU">Europe/Moscow</id>
+ <id>Europe/Volgograd</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 ad5caad..dad5a49 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 4d317d3..4c3e0bc 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 063cb1e..a72a8c9 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