Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / timezone / 98617a692eaa5707ffd39d8bd892a29e5dac0f79^1..98617a692eaa5707ffd39d8bd892a29e5dac0f79 / .
commit98617a692eaa5707ffd39d8bd892a29e5dac0f79[log] [tgz]
authorandroid-build-team Robot <android-build-team-robot@google.com>Fri Nov 13 00:03:51 2020 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>Fri Nov 13 00:03:51 2020 +0000
treeccad389d6a6c11d639887275454f89207de586ec
parent6e50f593e6a5f3b280bf83a4ae8742e8a2368946 [diff]
parente3502838b64451ae06800004ba5e45e04f21e929 [diff]
Snap for 6969586 from e3502838b64451ae06800004ba5e45e04f21e929 to rvc-qpr2-release

Change-Id: If91ecb959a8e89b346116a898f54313caa23d546

diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 9d67ac3..661c158 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:"2020b"
+ianaVersion:"2020c"
 
 # countries:
 #

diff --git a/input_data/iana/tzdata2020b.tar.gz b/input_data/iana/tzdata2020b.tar.gz
deleted file mode 100644
index 874e97e..0000000
--- a/input_data/iana/tzdata2020b.tar.gz
+++ /dev/null
Binary files differ

diff --git a/input_data/iana/tzdata2020b.tar.gz.asc b/input_data/iana/tzdata2020b.tar.gz.asc
deleted file mode 100644
index 062a7a1..0000000
--- a/input_data/iana/tzdata2020b.tar.gz.asc
+++ /dev/null

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl99HToACgkQ7ZfpDmKq
-fjT5CQ//W6kd+vP2tAdMbmJnH35sCd0NoAFBC1j00Blg+I6s507w5VjOTjvrvjlE
-0RB2G67vNKTOBybPyk7l8cKq+5Xw5IE1xqwqfpN3+DH2BWt4P0AllcBBRRky9iXS
-oO+z4F51rud9+CD2vbhtx0eT9MWYVfzrncNUHIYm7sDx01vtCp3h5u9ryB2sfHT/
-iMKrB5ytFqWkNXZtMiRDj3LZF0y2+JM1/8lfZB/hyxx1Bbvcm07dQvBBz8ljT6KD
-/BJFsgwvvlpxOZ1P0fFb7BnMPD5v/fB5r/0i/c4ErIY8JPtxDY6ctGdtbC/0H7Xf
-kjve+Fue08CBg4tXEW75SvWBP8Li1XylSNohIEtnclXj9B1nwu0WArZtATIqhpxl
-T77J85JkVQoAi5Wh38Msy9QWb54FRoK8/c1drfwb/iMkRYt57mU5zuY9JJvx7mAm
-S3eVqU3/tX4Ue7gQ1hjW3m9abmS1Hmq4aQ8r1uS0t2cIjbrMY2zaRwYzb2UknT2w
-VVr5O5bWoPHSFDeqUU7NdGHQzJX+NLvpTlcvJHXONSu7CksC09uhzBVJ2LbkjQS1
-zD+jSCTgXZonegcF0/UsfMrxmrizDFVcvwDXnDa4TcRPVSevtdWvM+EXr3Dto0N/
-wlI4v2nZE2ZFB3+7iGxc0WwiHUdsVbQVD+fCTIBl4Uh4ViTAsXI=
-=/O2G
------END PGP SIGNATURE-----

diff --git a/input_data/iana/tzdata2020c.tar.gz b/input_data/iana/tzdata2020c.tar.gz
new file mode 100644
index 0000000..2a0afd0
--- /dev/null
+++ b/input_data/iana/tzdata2020c.tar.gz
Binary files differ

diff --git a/input_data/iana/tzdata2020c.tar.gz.asc b/input_data/iana/tzdata2020c.tar.gz.asc
new file mode 100644
index 0000000..b0ac570
--- /dev/null
+++ b/input_data/iana/tzdata2020c.tar.gz.asc

@@ -0,0 +1,16 @@
+-----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/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 55f94bd..3aa5e27 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml

@@ -2,7 +2,7 @@
 
  **** Autogenerated file - DO NOT EDIT ****
 
---><timezones ianaversion="2020b">
+--><timezones ianaversion="2020c">
  <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 6fd662a..7956711 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 bd4c212..ca2b8f1 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 f765a0c..cab95c8 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 f192f27..ce90825 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version

@@ -1 +1 @@
-004.001|2020b|001
\ No newline at end of file
+004.001|2020c|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 14f34d8..5c5480b 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 7180b9b..c495d74 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 367c28a..99a1105 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 767c529..1995245 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 9e128c2..986e7fb 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 54822e7..fcf71d1 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 4b6c8f1..953131a 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 7180b9b..c495d74 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
Binary files differ