Merge "Update tzdb version from 2019a to 2019b"
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index d3d84bf..c9c30ab 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:"2019a"
+ianaVersion:"2019b"
# countries:
#
@@ -2750,15 +2750,6 @@
priority:474
>
timeZoneMappings:<
- utcOffset:"3:00"
- id:"Europe/Simferopol"
- # ?
- priority:1
- # http://b/73922616
- shownInPicker:false
- >
-
- timeZoneMappings:<
utcOffset:"2:00"
id:"Europe/Kaliningrad"
# 942K
@@ -3131,6 +3122,14 @@
id:"Europe/Zaporozhye"
priority:2
>
+ timeZoneMappings:<
+ utcOffset:"3:00"
+ id:"Europe/Simferopol"
+ # ?
+ priority:1
+ # http://b/73922616
+ shownInPicker:false
+ >
>
# UGANDA
diff --git a/input_data/iana/tzdata2019a.tar.gz b/input_data/iana/tzdata2019a.tar.gz
deleted file mode 100644
index 8d6c3f7..0000000
--- a/input_data/iana/tzdata2019a.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2019a.tar.gz.asc b/input_data/iana/tzdata2019a.tar.gz.asc
deleted file mode 100644
index c163977..0000000
--- a/input_data/iana/tzdata2019a.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlyZs50ACgkQ7ZfpDmKq
-fjTPrg/9HBD7RK0/e2NQc/IEg0BeZPOG/SsWOo78lQ23UVwqXdXqQz9LJXl9gTqM
-ENe8Ecknctk6fmfriAYnSydXx/MwWDbze5nmi4p7wzlogL/ctPILJvQbc/T62fDK
-NpGNwDlaUX/ht7cRG9VO+oun3Zc7efGHJB9UpZDDVZGtq6VT5+AZIryM12XvHfcR
-g0P+0pZfZu9LI4H0K/JUmNnRRXLoq6/5OsV6+hFlTzS7quVfUu+Vb+gsoUVejXld
-77hNvqdAaRBwVW69hjdUL2WJXymQtP/1ZoeOVHskti0HQBFRJsDc4Fhs3Pe5MUWd
-PXVanz/C0sHhHbTLfHs4wVQvNg4g4OP5nl9DyF+KG2SqfuqWOzfbEs5bc8dGqFCk
-HLdj7Nd4eQA8x/Xl6OSukE1yzUR8Xkb9GFgTmpHlP7uq/TH2URJdd/ZXhSgPv+u6
-bM9ghH9eirnVDPxWxsj0bwkZYHY6eJC8pgLPpXsxBY0ktJD/hqS1IMXOAyPRj9fO
-uRt7QLcsJW+wx6Q7ggsgTs7cxnq/Pk55S0lcp63mAu960+2XuBy8ffFJp4J2OwqS
-U6nBCtAZ6ZONKvsoQ4UpIcNfkYEiM3A4XNjn/rL2Jtb0cDA8e0j66/k1vcOc9p6u
-KQSXvSrhoqGTqhKy03XuQJ7LYhSgtD790sxFOXWS59cs/WcLO+M=
-=g5BY
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2019b.tar.gz b/input_data/iana/tzdata2019b.tar.gz
new file mode 100644
index 0000000..203cc21
--- /dev/null
+++ b/input_data/iana/tzdata2019b.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2019b.tar.gz.asc b/input_data/iana/tzdata2019b.tar.gz.asc
new file mode 100644
index 0000000..a6c2ecf
--- /dev/null
+++ b/input_data/iana/tzdata2019b.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl0Zs9AACgkQ7ZfpDmKq
+fjT55Q/9G4BmEDL48wU0slZCAFNMqbvNfizL2MTNHC6Yv60gwdQCl7CgQk+zE+1W
+b4ir1Vm23eWWVdCjGGwjt4WWy+SlvnEKqjiZxTRFpkB5to8Zi5KNklGlUX0U9iUu
+vMCVKeIQMFLUr6sAqAk4lgJ2OUF1MNaj2kVwINxS+C8rCyr6wjn6FWWaxvbCO3+D
+2Z8sZgCRBWxmckqX+4Nmv2YeCGuL1ZjVTz0flkWi/OduR+PjBe/9PN506PjeEht8
+cqOjtRz/V4SEKfbv6rn8jqxDrl6xkrBxfiaF64smWgwSFcQ9yRrxCt2L35tARdal
+DAP/vb1PemUb0fJawYP/ZhiArk0fCRRZ+wleTZKsk65I4VsrffQ3rYe5ZtMYnUhO
++UP+B7OkxNa0gARf+uFwYvrqZefg0HRq/INFqd3TCkza0wa7Rb3mQL9orCzUH7St
+XLrdhRJYWGcuepGBiTdO4+yPqXkK7k89W3ACo+HiVuRbMRo3Xf+38918kubns41l
+/itR/C/lSN+/ErokSh6VshelvOuMVcgoghTD7fDAtNaH9IgldEIF/Wf3m1Um+V9R
+sN646EvAazgkxw3hD1sEDxHxN7TIsxFvTaimVg+uwrX2b8Ok+tffomlalSXoOS8F
+zK/EyKROm8v2dSJUD0Hf+FvDqJm/Pre0ydKqsdahJYBxIStNnX8=
+=P/tF
+-----END PGP SIGNATURE-----
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 7ab167b..5609355 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
**** Autogenerated file - DO NOT EDIT ****
---><timezones ianaversion="2019a">
+--><timezones ianaversion="2019b">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -134,11 +134,11 @@
<id notafter="1330221600000">America/Recife</id>
<id notafter="1361066400000">America/Araguaina</id>
<id notafter="824004000000">America/Maceio</id>
- <id>America/Bahia</id>
+ <id notafter="1550368800000">America/Bahia</id>
<id notafter="1214280000000">America/Santarem</id>
<id>America/Manaus</id>
<id notafter="1076814000000">America/Campo_Grande</id>
- <id>America/Cuiaba</id>
+ <id notafter="1550372400000">America/Cuiaba</id>
<id notafter="761713200000">America/Porto_Velho</id>
<id notafter="971578800000">America/Boa_Vista</id>
<id notafter="761716800000">America/Eirunepe</id>
@@ -714,7 +714,6 @@
<id>Europe/Volgograd</id>
<id>Europe/Moscow</id>
<id>Europe/Kirov</id>
- <id picker="n" notafter="1396137600000">Europe/Simferopol</id>
<id>Europe/Kaliningrad</id>
</country>
<country code="rw" default="Africa/Kigali" everutc="n">
@@ -835,6 +834,7 @@
<id>Europe/Kiev</id>
<id notafter="686091600000">Europe/Uzhgorod</id>
<id notafter="686102400000">Europe/Zaporozhye</id>
+ <id picker="n">Europe/Simferopol</id>
</country>
<country code="ug" default="Africa/Kampala" everutc="n">
<id>Africa/Kampala</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index b2ebf5c..3313b5b 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 b61bd24..7cc666d 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 f2fc3f4..17a5cc3 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 ee2a1dd..dadd38b 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-004.001|2019a|001
\ No newline at end of file
+004.001|2019b|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 dc29817..e366faf 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -134,11 +134,11 @@
<id notafter="1330221600000">America/Recife</id>
<id notafter="1361066400000">America/Araguaina</id>
<id notafter="824004000000">America/Maceio</id>
- <id>America/Bahia</id>
+ <id notafter="1550368800000">America/Bahia</id>
<id notafter="1214280000000">America/Santarem</id>
<id>America/Manaus</id>
<id notafter="1076814000000">America/Campo_Grande</id>
- <id>America/Cuiaba</id>
+ <id notafter="1550372400000">America/Cuiaba</id>
<id notafter="761713200000">America/Porto_Velho</id>
<id notafter="971578800000">America/Boa_Vista</id>
<id notafter="761716800000">America/Eirunepe</id>
@@ -714,7 +714,6 @@
<id>Europe/Volgograd</id>
<id>Europe/Moscow</id>
<id>Europe/Kirov</id>
- <id picker="n" notafter="1396137600000">Europe/Simferopol</id>
<id>Europe/Kaliningrad</id>
</country>
<country code="rw" default="Africa/Kigali" everutc="n">
@@ -835,6 +834,7 @@
<id>Europe/Kiev</id>
<id notafter="686091600000">Europe/Uzhgorod</id>
<id notafter="686102400000">Europe/Zaporozhye</id>
+ <id picker="n">Europe/Simferopol</id>
</country>
<country code="ug" default="Africa/Kampala" everutc="n">
<id>Africa/Kampala</id>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index 3e63003..43cd660 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 ef81695..7fc7799 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 e5e3824..23525e1 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 bc9a517..c5bd3e9 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -134,11 +134,11 @@
<id notafter="1330221600000">America/Recife</id>
<id notafter="1361066400000">America/Araguaina</id>
<id notafter="824004000000">America/Maceio</id>
- <id>America/Bahia</id>
+ <id notafter="1550368800000">America/Bahia</id>
<id notafter="1214280000000">America/Santarem</id>
<id>America/Manaus</id>
<id notafter="1076814000000">America/Campo_Grande</id>
- <id>America/Cuiaba</id>
+ <id notafter="1550372400000">America/Cuiaba</id>
<id notafter="761713200000">America/Porto_Velho</id>
<id notafter="971578800000">America/Boa_Vista</id>
<id notafter="761716800000">America/Eirunepe</id>
@@ -714,7 +714,6 @@
<id>Europe/Volgograd</id>
<id>Europe/Moscow</id>
<id>Europe/Kirov</id>
- <id picker="n" notafter="1396137600000">Europe/Simferopol</id>
<id>Europe/Kaliningrad</id>
</country>
<country code="rw" default="Africa/Kigali" everutc="n">
@@ -835,6 +834,7 @@
<id>Europe/Kiev</id>
<id notafter="686091600000">Europe/Uzhgorod</id>
<id notafter="686102400000">Europe/Zaporozhye</id>
+ <id picker="n">Europe/Simferopol</id>
</country>
<country code="ug" default="Africa/Kampala" everutc="n">
<id>Africa/Kampala</id>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index e08fce3..4070bf6 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 8f0302f..b4b004c 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 a44c3c7..746fc04 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 dc29817..e366faf 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -134,11 +134,11 @@
<id notafter="1330221600000">America/Recife</id>
<id notafter="1361066400000">America/Araguaina</id>
<id notafter="824004000000">America/Maceio</id>
- <id>America/Bahia</id>
+ <id notafter="1550368800000">America/Bahia</id>
<id notafter="1214280000000">America/Santarem</id>
<id>America/Manaus</id>
<id notafter="1076814000000">America/Campo_Grande</id>
- <id>America/Cuiaba</id>
+ <id notafter="1550372400000">America/Cuiaba</id>
<id notafter="761713200000">America/Porto_Velho</id>
<id notafter="971578800000">America/Boa_Vista</id>
<id notafter="761716800000">America/Eirunepe</id>
@@ -714,7 +714,6 @@
<id>Europe/Volgograd</id>
<id>Europe/Moscow</id>
<id>Europe/Kirov</id>
- <id picker="n" notafter="1396137600000">Europe/Simferopol</id>
<id>Europe/Kaliningrad</id>
</country>
<country code="rw" default="Africa/Kigali" everutc="n">
@@ -835,6 +834,7 @@
<id>Europe/Kiev</id>
<id notafter="686091600000">Europe/Uzhgorod</id>
<id notafter="686102400000">Europe/Zaporozhye</id>
+ <id picker="n">Europe/Simferopol</id>
</country>
<country code="ug" default="Africa/Kampala" everutc="n">
<id>Africa/Kampala</id>
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index faf1043..db4cfd9 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 ef81695..7fc7799 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
Binary files differ
