Snap for 5285806 from 44ebb70e4303e72de28fd3ad9200777f0b6212a4 to pi-qpr3-release
Change-Id: I9c8217f3879665b395ac0ced31b93db28868333a
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index b6139e0..ca74897 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:"2018g"
+ianaVersion:"2018i"
# countries:
#
@@ -1202,7 +1202,7 @@
countries:<
isoCode:"eh"
timeZoneMappings:<
- utcOffset:"1:00"
+ utcOffset:"0:00"
id:"Africa/El_Aaiun"
>
>
@@ -1799,7 +1799,7 @@
# KAZAKHSTAN
#
-# Priorities assigned on 20180309 using:
+# Priorities assigned on 20190107 using:
# https://en.wikipedia.org/wiki/List_of_cities_in_Kazakhstan
# Priority is just an abstract score.
countries:<
@@ -1812,8 +1812,7 @@
>
timeZoneMappings:<
utcOffset:"6:00"
- id:"Asia/Qyzylorda"
- priority:1
+ id:"Asia/Qostanay"
>
timeZoneMappings:<
@@ -1827,6 +1826,11 @@
>
timeZoneMappings:<
utcOffset:"5:00"
+ id:"Asia/Qyzylorda"
+ priority:1
+ >
+ timeZoneMappings:<
+ utcOffset:"5:00"
id:"Asia/Aqtobe"
priority:1
>
@@ -1940,7 +1944,7 @@
countries:<
isoCode:"ma"
timeZoneMappings:<
- utcOffset:"1:00"
+ utcOffset:"0:00"
id:"Africa/Casablanca"
>
>
@@ -2919,7 +2923,7 @@
countries:<
isoCode:"st"
timeZoneMappings:<
- utcOffset:"1:00"
+ utcOffset:"0:00"
id:"Africa/Sao_Tome"
>
>
diff --git a/input_data/iana/tzdata2018g.tar.gz b/input_data/iana/tzdata2018g.tar.gz
deleted file mode 100644
index f366e3e..0000000
--- a/input_data/iana/tzdata2018g.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2018g.tar.gz.asc b/input_data/iana/tzdata2018g.tar.gz.asc
deleted file mode 100644
index 33e97df..0000000
--- a/input_data/iana/tzdata2018g.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlvT+vsACgkQ7ZfpDmKq
-fjSOeQ/+KHzhT6GWZeqOAKj/AjyKK9KnL4gPh4MhsiI+V3z3/y+4ECvvee7ixbHI
-NQ33B4gRBzlbWWYnHw4Yq6Fm9RihnHOVj8XT/BM56YFESdfTQxOHsqsY+n3byGND
-Q+luSH0YC/S4mLxqS/vxHyT+nU2D4sS6UCmMIzW62fixJX5S2HAC3s7WoQkRXRDg
-ItaQvU42r9qs67C4M8q2+A9H7anUIhIE5KqZcPKmF7AMAdGnY4ZWpKb/uyxwzi58
-pctIhzSGkB8im2m8QgDTrYsflOgADw3j/dKuYnyu4J0aniWC3qp7nJFPr5uTDaW7
-TsWtaZCaUhytlsg+E0zebTURV2ziVNf52X58U9K3kUnnZqOxxZUeQWACmdjCc0kO
-yg9P1idYz1XTC4c0oik/YTt5OMkpkyFNqTaueSSQ3dpD0vc63GbGrDbMSPfa6bOx
-EOHvR/IqcNKCewfnv7a8h7y+5JX52gijL5hZjkpAU/XBCMdA3Pd/vZ5n3UaSbnC1
-MNmZgsnJjBKVgaK8KHTuhCGigtDFc6TQethUQlKKWLr41P5RWrdmrhmMZIP0VBt5
-4X0Kf7mKK2X/lsI33FCpzUbtnV093L1bLe6Vt74r01JBWUxeEy2BHdn+KM/CqHkH
-LTj0FmVFUWzvG7kqzrRgjJ5CnLUSnf/T1Gl6PgeKzMePChptyQE=
-=kUHt
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2018i.tar.gz b/input_data/iana/tzdata2018i.tar.gz
new file mode 100644
index 0000000..be28d0c
--- /dev/null
+++ b/input_data/iana/tzdata2018i.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2018i.tar.gz.asc b/input_data/iana/tzdata2018i.tar.gz.asc
new file mode 100644
index 0000000..1fd503f
--- /dev/null
+++ b/input_data/iana/tzdata2018i.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIyBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlwpGB8ACgkQ7ZfpDmKq
+fjTMog/3YJT5eFuwlijuTDxlt+VMTaAEaDaSUfzmQhaTDuHPKVDXxCaWq+tcO4J8
+gzzecRj40Xc/jZId7MREq2S3uyUu7D6tJR7kRMw8BeTYVkhf+wX4Xmfh+6bVB9bO
+34GNTSK9BXoieio68AkaCziVhBy6KynKhzUS4d1sqEDUxhS7r3ir6jTiU4UGAf54
+PKWh2YKYITuYww4XnseG9rQsKbVKK4GUm/e7OmV3zf5pI9lhf/TQh1XZXKFbKK70
+gDmFPUDAyuiFBCxkA7YsGolAnkscVmuF301brsNg+VKPy1qgMbxY/vF0lo/f7xRw
+dzi8+ek6/pKCIUmVRWCsg68wUDh1j3pAh9MLT8zhMtxOc42Kh+4b1BNq0x45zVbQ
+693ufcf056654Y27bCexy1JbGBNEd6UUGUv/Ou9EGrl6nfrfMSmUneqmBEnl8NY+
+6/cge/JOr+rVbmEku+nuC9kLZx63lSy4BXJ8+vv4DgzE6/3906V30+w/oJUGaImx
+PjE9tjm6biIWdRi6bZRdFcg0mktBEyzJuAuurX0ZRgcaNkrhNd4zw2Q3yuKDcD67
+aM5wUA4JVLX5v6P+s5j5Y+B+OY4sVk8fFzev8BJX+wRulqEmchVertypir17PUSr
+oqRUAww6oaYwenZNE+6dN0OWtpLDdBUv7+pesiYcaJRrXDCLAA==
+=ttI4
+-----END PGP SIGNATURE-----
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 7e0fc27..3a553fb 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
**** Autogenerated file - DO NOT EDIT ****
---><timezones ianaversion="2018g">
+--><timezones ianaversion="2018i">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -465,10 +465,11 @@
</country>
<country code="kz" default="Asia/Almaty" everutc="n">
<id>Asia/Almaty</id>
- <id notafter="1099170000000">Asia/Qyzylorda</id>
+ <id notafter="1099170000000">Asia/Qostanay</id>
<id notafter="1099173600000">Asia/Aqtau</id>
<id>Asia/Oral</id>
- <id>Asia/Aqtobe</id>
+ <id notafter="1545328800000">Asia/Qyzylorda</id>
+ <id notafter="1545328800000">Asia/Aqtobe</id>
<id notafter="922572000000">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -524,7 +525,7 @@
</country>
<country code="mh" default="Pacific/Majuro" everutc="n">
<id>Pacific/Majuro</id>
- <id notafter="745848000000">Pacific/Kwajalein</id>
+ <id notafter="745934400000">Pacific/Kwajalein</id>
</country>
<country code="mk" default="Europe/Skopje" everutc="n">
<id>Europe/Skopje</id>
@@ -868,7 +869,7 @@
<id notafter="436359600000">America/Juneau</id>
<id notafter="436356000000">America/Yakutat</id>
<id notafter="436363200000">America/Nome</id>
- <id notafter="1446372000000">America/Metlakatla</id>
+ <id notafter="1552215600000">America/Metlakatla</id>
<id notafter="341402400000">America/Sitka</id>
<id>Pacific/Honolulu</id>
<id>America/Adak</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 72cf3ca..485a6d4 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 ebe66d2..6c55cd8 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 284af9e..93f3bd9 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index a8cdb91..315a6da 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -465,10 +465,11 @@
</country>
<country code="kz" default="Asia/Almaty" everutc="n">
<id>Asia/Almaty</id>
- <id notafter="1099170000000">Asia/Qyzylorda</id>
+ <id notafter="1099170000000">Asia/Qostanay</id>
<id notafter="1099173600000">Asia/Aqtau</id>
<id>Asia/Oral</id>
- <id>Asia/Aqtobe</id>
+ <id notafter="1545328800000">Asia/Qyzylorda</id>
+ <id notafter="1545328800000">Asia/Aqtobe</id>
<id notafter="922572000000">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -524,7 +525,7 @@
</country>
<country code="mh" default="Pacific/Majuro" everutc="n">
<id>Pacific/Majuro</id>
- <id notafter="745848000000">Pacific/Kwajalein</id>
+ <id notafter="745934400000">Pacific/Kwajalein</id>
</country>
<country code="mk" default="Europe/Skopje" everutc="n">
<id>Europe/Skopje</id>
@@ -868,7 +869,7 @@
<id notafter="436359600000">America/Juneau</id>
<id notafter="436356000000">America/Yakutat</id>
<id notafter="436363200000">America/Nome</id>
- <id notafter="1446372000000">America/Metlakatla</id>
+ <id notafter="1552215600000">America/Metlakatla</id>
<id notafter="341402400000">America/Sitka</id>
<id>Pacific/Honolulu</id>
<id>America/Adak</id>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index 3c5c6b7..b9c2221 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 8068828..71de696 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 795820c..10ecdff 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 569bde8..8b101e2 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -465,10 +465,11 @@
</country>
<country code="kz" default="Asia/Almaty" everutc="n">
<id>Asia/Almaty</id>
- <id notafter="1099170000000">Asia/Qyzylorda</id>
+ <id notafter="1099170000000">Asia/Qostanay</id>
<id notafter="1099173600000">Asia/Aqtau</id>
<id>Asia/Oral</id>
- <id>Asia/Aqtobe</id>
+ <id notafter="1545328800000">Asia/Qyzylorda</id>
+ <id notafter="1545328800000">Asia/Aqtobe</id>
<id notafter="922572000000">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -524,7 +525,7 @@
</country>
<country code="mh" default="Pacific/Majuro" everutc="n">
<id>Pacific/Majuro</id>
- <id notafter="745848000000">Pacific/Kwajalein</id>
+ <id notafter="745934400000">Pacific/Kwajalein</id>
</country>
<country code="mk" default="Europe/Skopje" everutc="n">
<id>Europe/Skopje</id>
@@ -868,7 +869,7 @@
<id notafter="436359600000">America/Juneau</id>
<id notafter="436356000000">America/Yakutat</id>
<id notafter="436363200000">America/Nome</id>
- <id notafter="1446372000000">America/Metlakatla</id>
+ <id notafter="1552215600000">America/Metlakatla</id>
<id notafter="341402400000">America/Sitka</id>
<id>Pacific/Honolulu</id>
<id>America/Adak</id>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index b312228..248c99b 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 975dbe7..234ee76 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 7fb0cef..627a5a1 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
