Snap for 5180536 from 9fff3df46bcab5c3575b40b7c3b2910e8bb21286 to pi-platform-release
Change-Id: I46ccc43598c3c46adf76f57dd9ca1985d49dd8e8
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 33be426..b6139e0 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:"2018e"
+ianaVersion:"2018g"
# countries:
#
@@ -1202,7 +1202,7 @@
countries:<
isoCode:"eh"
timeZoneMappings:<
- utcOffset:"0:00"
+ utcOffset:"1:00"
id:"Africa/El_Aaiun"
>
>
@@ -1940,7 +1940,7 @@
countries:<
isoCode:"ma"
timeZoneMappings:<
- utcOffset:"0:00"
+ utcOffset:"1:00"
id:"Africa/Casablanca"
>
>
@@ -2727,7 +2727,12 @@
# 2.52M
priority:2520
>
-
+ timeZoneMappings:<
+ utcOffset:"4:00"
+ id:"Europe/Volgograd"
+ # 2.61M
+ priority:2610
+ >
timeZoneMappings:<
utcOffset:"3:00"
id:"Europe/Moscow"
@@ -2736,12 +2741,6 @@
>
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/tzdata2018e.tar.gz b/input_data/iana/tzdata2018e.tar.gz
deleted file mode 100644
index 8955eea..0000000
--- a/input_data/iana/tzdata2018e.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2018e.tar.gz.asc b/input_data/iana/tzdata2018e.tar.gz.asc
deleted file mode 100644
index 1450a6b..0000000
--- a/input_data/iana/tzdata2018e.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJa6V9nAAoJEO2X6Q5iqn40qYUQAI21DF4x+Qr9uhMf5UL3u/UI
-BnLTeDqc4t1oLbuuJsbtgausc/m6EIgo2j9+uadXefnguP4fwKHJ2doReuRZ3njI
-hGnqP2+yCfTRNrZYBU3p6U+/OJq8r/UBsn9aGxNStcZHe6FswnxXWlzpRNbPdNBC
-nGeYMs2HOQjcdG08BF1sjGm4FC/NS6bugNhs0EcrMLaVa+c0keRWNg9o7Y/SvrZB
-awFAMz4LhOog2qxhGWtFgSVRAAj5aEDqugOXZL27VszgGPexiAaMCFyQARIHigIw
-959D7RYmpeNuEeP6XbzGFgDO6aMbxahoUpP9cCOUI6qKShtDKnY2XkjPmVQiAfjZ
-zvpsE1dYbWyVTWqWhWL3z0lPCFN6B4eneY6UXY/KtENRl1jEafKN5/7JqKOMBSRo
-umE1Jy6qSSz5jLuz5pX59iOXWZETIlwtAW6lKe2s6l9xWPL9R8xXoPvbQRadqDxB
-uANcGZSrKD1jKuybPJa/6BZRF+FlldCkZVVKSSdXuPLF1HhohlvFZqi1WPmWvGd+
-s/1+3OhWzB4BHyrp3Wbtj+ZwCtg9UVbJLBM2bgL9nGEyv/1XSxgLJEp3rneIMpJv
-AMK8rr3XehXLDkXAfx68Mzs3F4lYEdXk6y9f9ZsVj+IdBotwzzjJWeCfnlmJM52y
-8cCrPGUjdneFidV9OZ+J
-=4LFO
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2018g.tar.gz b/input_data/iana/tzdata2018g.tar.gz
new file mode 100644
index 0000000..f366e3e
--- /dev/null
+++ b/input_data/iana/tzdata2018g.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2018g.tar.gz.asc b/input_data/iana/tzdata2018g.tar.gz.asc
new file mode 100644
index 0000000..33e97df
--- /dev/null
+++ b/input_data/iana/tzdata2018g.tar.gz.asc
@@ -0,0 +1,16 @@
+-----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/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 43dfb98..7e0fc27 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
**** Autogenerated file - DO NOT EDIT ****
---><timezones ianaversion="2018e">
+--><timezones ianaversion="2018g">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -710,8 +710,8 @@
<id notafter="701823600000">Europe/Astrakhan</id>
<id notafter="1480806000000">Europe/Ulyanovsk</id>
<id>Europe/Saratov</id>
+ <id>Europe/Volgograd</id>
<id>Europe/Moscow</id>
- <id notafter="701823600000">Europe/Volgograd</id>
<id>Europe/Kirov</id>
<id picker="n" notafter="1396137600000">Europe/Simferopol</id>
<id>Europe/Kaliningrad</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index c62d9a5..72cf3ca 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 5c17a8b..ebe66d2 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 c50ba20..284af9e 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 faf97d0..a8cdb91 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -710,8 +710,8 @@
<id notafter="701823600000">Europe/Astrakhan</id>
<id notafter="1480806000000">Europe/Ulyanovsk</id>
<id>Europe/Saratov</id>
+ <id>Europe/Volgograd</id>
<id>Europe/Moscow</id>
- <id notafter="701823600000">Europe/Volgograd</id>
<id>Europe/Kirov</id>
<id picker="n" notafter="1396137600000">Europe/Simferopol</id>
<id>Europe/Kaliningrad</id>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index 3532844..3c5c6b7 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 95236a9..8068828 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 f156998..795820c 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 1e3c64d..569bde8 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -710,8 +710,8 @@
<id notafter="701823600000">Europe/Astrakhan</id>
<id notafter="1480806000000">Europe/Ulyanovsk</id>
<id>Europe/Saratov</id>
+ <id>Europe/Volgograd</id>
<id>Europe/Moscow</id>
- <id notafter="701823600000">Europe/Volgograd</id>
<id>Europe/Kirov</id>
<id picker="n" notafter="1396137600000">Europe/Simferopol</id>
<id>Europe/Kaliningrad</id>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index ea6b02e..b312228 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 393191b..975dbe7 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 8c365bc..7fb0cef 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