RESTRICT AUTOMERGE Update Android from 2020c to 2020d [R]
Update Android from 2020c to 2020d [R]
Notes for Android time zone maintainers:
Like all tzdb updates, the binary files in this commit should not be
patched to other release branches: they are not guaranteed to work.
Also note that there are associated changes in external/icu and often
others that should also be applied. tzdb updates are incremental
changes: all previous tzdb updates should be applied. Look for
aosp/<release>-dev changes for backports. If you have a local branch
with ICU changes the ICU .dat file in external/icu will not apply
cleanly. Instead, make equivalent changes to text files and run
system/timezone/update-tzdata.py.
----------
IANA TZDB 2020d release description:
Briefly:
Palestine ends DST earlier than predicted, on 2020-10-24.
Changes to past and future timestamps
Palestine ends DST on 2020-10-24 at 01:00, instead of 2020-10-31
as previously predicted (thanks to Sharef Mustafa.) Its
2019-10-26 fall-back was at 00:00, not 01:00 (thanks to Steffen
Thorsen.) Its 2015-10-23 transition was at 01:00 not 00:00, and
its spring 2020 transition was on March 28 at 00:00, not March 27
(thanks to Pierre Cashon.) This affects Asia/Gaza and
Asia/Hebron. Assume future spring and fall transitions will be on
the Saturday preceding the last Sunday of March and October,
respectively.
Bug: 171547222
Test: Ran CtsLibcoreTestCases, CtsLibcoreOjTestCases, CtsBionicTestCases
Test: CtsIcuTestCases
Merged-In: I968f653d51aae30b9c5fdd343a220580b9a8cea2
Change-Id: I968f653d51aae30b9c5fdd343a220580b9a8cea2
(cherry picked from commit ddd4b75dd6c7ce65073c755f5a204ed79ba97437)
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 661c158..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:"2020c"
+ianaVersion:"2020d"
# countries:
#
diff --git a/input_data/iana/tzdata2020c.tar.gz b/input_data/iana/tzdata2020c.tar.gz
deleted file mode 100644
index 2a0afd0..0000000
--- a/input_data/iana/tzdata2020c.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2020c.tar.gz.asc b/input_data/iana/tzdata2020c.tar.gz.asc
deleted file mode 100644
index b0ac570..0000000
--- a/input_data/iana/tzdata2020c.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl+J5IYACgkQ7ZfpDmKq
-fjQTXQ//ZSpk0iHiwnZqcqujuTh/YWXWvKaWAxRG3sRnz+i6IrrEzsaCrod4yENf
-7BSLVrrrNHbAha7S3q/SIIrm2atrEZok/9s7TSa4vIhMASQYY2N+A5DrXcyWYkkE
-+9SPJH71SKG1MrY2vafr7vgbqXSi9P0LINPjUktUoOj/SS5+DofH6BuMh0f1W6ue
-VDAnjtlcxxHXVo/lNrKt9xckRNXn7O83QIQmnBTXGh7VhmTBpM2E21DvSk7fmbXG
-AJ76RxUbz2t0IwSSu6AtP4KrrvoMoltmQM0N0AIWEUt1dcy0q3hIyOB7/J7uJQiQ
-0+oDxCBcW1Y2J9X2ZEwzHIZhs1dMvjCRL/PA7aDaSZg5yI6SaovUx8p08/alYUNM
-fEij8fHcsM4Sy26LDZmd3VHXS5ETY6uRd1jZ+e2X8dZa/oo2wwLsxpxg8cFupc94
-vvOHgo/4pQFXAKTNw/bcYi387ixjSrEW9Ap4xNtyZrPUoajhhDMdFlxYhbcg4yGw
-Mz1G6DJtcAZYn56LfwS2IV9X7bf/0NidzBP+YJrLJ3XTIJHHmsZgypYLgrzd33LZ
-7kKx/cT38bPFELKq0OfHttr/Ax7Ed8TEvuVqCjohHodVqxDvWSYpEoYS7gRtmn0p
-IOPgXEDMuz6ouBKnArE7j4DHGJGX59eoOXIeSbBDbBXmCZ5jxaA=
-=MSiH
------END PGP SIGNATURE-----
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/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 3aa5e27..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="2020c">
+--><timezones ianaversion="2020d">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 7956711..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 ca2b8f1..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 cab95c8..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 ce90825..d503456 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-004.001|2020c|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/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index 5c5480b..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 c495d74..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 99a1105..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/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 1995245..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 986e7fb..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 fcf71d1..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/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index 953131a..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 c495d74..231ab4a 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
Binary files differ