Merge 306b238497a456135c8f9f0f490a806d6b91987a on remote branch
Change-Id: Ib9118e14ae717c684a72c906cb5a37398c398ca2
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 25a0376..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:"2020a"
+ianaVersion:"2020d"
# countries:
#
@@ -204,7 +204,7 @@
>
timeZoneMappings:<
- utcOffset:"08:00"
+ utcOffset:"11:00"
id:"Antarctica/Casey"
>
@@ -400,7 +400,7 @@
>
timeZoneMappings:<
- utcOffset:"11:00"
+ utcOffset:"10:00"
id:"Antarctica/Macquarie"
# Unknown
priority:1
diff --git a/input_data/iana/tzdata2020a.tar.gz b/input_data/iana/tzdata2020a.tar.gz
deleted file mode 100644
index 15b39fb..0000000
--- a/input_data/iana/tzdata2020a.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2020a.tar.gz.asc b/input_data/iana/tzdata2020a.tar.gz.asc
deleted file mode 100644
index 222ad46..0000000
--- a/input_data/iana/tzdata2020a.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl6iH9MACgkQ7ZfpDmKq
-fjTb6g/+P/l6Nev5Zv8mUktnT6eNKohtgpNRyHd8nYV92wmTiDSzAArFy7oi5CVV
-/jMv8sbV1ssq/5rQ6HUQuMDPgEIO405gxmqRWMhE6UwUbRxxa+/HKGUJH0AHY6Dh
-1UhVD7QA6fDovs84ip/WgTEZYcYApLr2A3IfC0rDqDo42DiSnErFQDvqRMJQkQS1
-p2Pv7YtW/2NZ52wkfq75klSsjlXzlz6CzM5P3/YU/Hylj42sQdbdtbUAyQug3YpD
-QQ2PiZoP92iiGrcwkKXa5xvXJ6jEZCXqi7HbJKt8OW+XpZ/ZYbTZRq+JvMbTqkOL
-+XvVufo/pVASgv2V0ynzJu/XRiFUeJaecmEg6QiAiJ74UMTXSGFnK//R32M9dp29
-B4p2X2jmW9qjCwjbjQXl1Yl5ddlSyvBk2Lk4s1repQ2t7kphZx2C8P2WyQYGeP7H
-nZDucfmWK4OSh8cINexBE8xyagmv1T8mC4qEQbVPva6JysaodNBcf9WkKMCgituP
-tbPsVekSmG1GyN2ixPtpY86Fzjr60mEg1UKqHZIagRmH4kjUwd1gINCJgONaZZxo
-c1VfBD8ZORBZfG27+V5ISotKrK2UrKtcrSUEU1CC/ibOm1sSPfg0d5uxUVvg4E8+
-okdszbMnQ1i0eVKW+L+jY5XOO8kmSLp4YcnrqXDyZabxyWIGMt4=
-=7U2J
------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 1820102..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="2020a">
+--><timezones ianaversion="2020d">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -67,7 +67,7 @@
<id notafter="1193500800000">Australia/Hobart</id>
<id notafter="37728000000">Australia/Currie</id>
<id notafter="762883200000">Australia/Lindeman</id>
- <id>Antarctica/Macquarie</id>
+ <id notafter="1286035200000">Antarctica/Macquarie</id>
<id>Australia/Lord_Howe</id>
<id>Australia/Adelaide</id>
<id notafter="796149000000">Australia/Broken_Hill</id>
@@ -184,7 +184,7 @@
<id notafter="309945600000">America/Yellowknife</id>
<id notafter="294228000000">America/Inuvik</id>
<id>America/Whitehorse</id>
- <id notafter="1583661600000">America/Dawson_Creek</id>
+ <id notafter="1604214000000">America/Dawson_Creek</id>
<id notafter="84013200000">America/Creston</id>
<id notafter="1425808800000">America/Fort_Nelson</id>
<id notafter="120646800000">America/Dawson</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 95a3958..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 301e264..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 89facfe..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 530048f..d503456 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-004.001|2020a|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 9d3ae8d..951c87b 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
<id notafter="1193500800000">Australia/Hobart</id>
<id notafter="37728000000">Australia/Currie</id>
<id notafter="762883200000">Australia/Lindeman</id>
- <id>Antarctica/Macquarie</id>
+ <id notafter="1286035200000">Antarctica/Macquarie</id>
<id>Australia/Lord_Howe</id>
<id>Australia/Adelaide</id>
<id notafter="796149000000">Australia/Broken_Hill</id>
@@ -184,7 +184,7 @@
<id notafter="309945600000">America/Yellowknife</id>
<id notafter="294228000000">America/Inuvik</id>
<id>America/Whitehorse</id>
- <id notafter="1583661600000">America/Dawson_Creek</id>
+ <id notafter="1604214000000">America/Dawson_Creek</id>
<id notafter="84013200000">America/Creston</id>
<id notafter="1425808800000">America/Fort_Nelson</id>
<id notafter="120646800000">America/Dawson</id>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index c607a8a..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 c5a28a4..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 8ed9429..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 5f86aad..841f35b 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
<id notafter="1193500800000">Australia/Hobart</id>
<id notafter="37728000000">Australia/Currie</id>
<id notafter="762883200000">Australia/Lindeman</id>
- <id>Antarctica/Macquarie</id>
+ <id notafter="1286035200000">Antarctica/Macquarie</id>
<id>Australia/Lord_Howe</id>
<id>Australia/Adelaide</id>
<id notafter="796149000000">Australia/Broken_Hill</id>
@@ -184,7 +184,7 @@
<id notafter="309945600000">America/Yellowknife</id>
<id notafter="294228000000">America/Inuvik</id>
<id>America/Whitehorse</id>
- <id notafter="1583661600000">America/Dawson_Creek</id>
+ <id notafter="1604214000000">America/Dawson_Creek</id>
<id notafter="84013200000">America/Creston</id>
<id notafter="1425808800000">America/Fort_Nelson</id>
<id notafter="120646800000">America/Dawson</id>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 56afe3b..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 c2d09f8..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 533792d..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 9d3ae8d..951c87b 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
<id notafter="1193500800000">Australia/Hobart</id>
<id notafter="37728000000">Australia/Currie</id>
<id notafter="762883200000">Australia/Lindeman</id>
- <id>Antarctica/Macquarie</id>
+ <id notafter="1286035200000">Antarctica/Macquarie</id>
<id>Australia/Lord_Howe</id>
<id>Australia/Adelaide</id>
<id notafter="796149000000">Australia/Broken_Hill</id>
@@ -184,7 +184,7 @@
<id notafter="309945600000">America/Yellowknife</id>
<id notafter="294228000000">America/Inuvik</id>
<id>America/Whitehorse</id>
- <id notafter="1583661600000">America/Dawson_Creek</id>
+ <id notafter="1604214000000">America/Dawson_Creek</id>
<id notafter="84013200000">America/Creston</id>
<id notafter="1425808800000">America/Fort_Nelson</id>
<id notafter="120646800000">America/Dawson</id>
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index e9244b9..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 c5a28a4..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 4506871..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