Snap for 8189469 from 8514499054c271d1eb5ab861d70413944090b6d4 to tm-frc-tzdata4-release
Change-Id: Ib86fb916645dc537ca3bcf96d06df040dec9c265
diff --git a/METADATA b/METADATA
index ec590f4..844839e 100644
--- a/METADATA
+++ b/METADATA
@@ -11,25 +11,25 @@
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities1000.zip on 2021-07-29, SHA1=4a3ee08e4dd21c7fc136826c0fd4b96b7003103a, see android/version_info/cities1000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities1000.zip on 2020-11-10, SHA1=f293844bc9bec4638dfa60ed28a4cfd2562e0244, see android/version_info/cities1000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities15000.zip on 2021-07-29, SHA1=c27eb93f78f5bad551e293a4afcd7321ada28b99, see android/version_info/cities15000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities15000.zip on 2020-11-10, SHA1=c9a6e27be706285e93f074906248802e6e8cc737, see android/version_info/cities15000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities500.zip on 2021-07-29, SHA1=f4baae40e1e4d7bfd21ee4910e583d87ed2b87f1, see android/version_info/cities500.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities500.zip on 2020-11-10, SHA1=69a244fc1d97b637596752c6aa8b860c731667d8, see android/version_info/cities500.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities5000.zip on 2021-07-29, SHA1=43007a9d0c43645dbbf5b88e09479fe9698a2b8b, see android/version_info/cities5000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities5000.zip on 2020-11-10, SHA1=9da4ddf0bd4802794c946484ce578780a2b60c44, see android/version_info/cities5000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/readme.txt on 2021-07-29, SHA1=7dc17472faed8f71aebc3e4cf22af181ef2002fe, see android/version_info/readme.txt.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/readme.txt on 2020-11-10, SHA1=7dc17472faed8f71aebc3e4cf22af181ef2002fe, see android/version_info/readme.txt.headers"
}
- version: "As of 2021-07-29"
- last_upgrade_date { year: 2021 month: 7 day: 29 }
+ version: "As of 2020-11-10"
+ last_upgrade_date { year: 2020 month: 11 day: 10 }
license_type: NOTICE
}
diff --git a/OWNERS b/OWNERS
index d9e25b0..2f5a957 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
-# Component ID: 847766
-include platform/packages/modules/GeoTZ:/OWNERS
+nfuller@google.com
+vichang@google.com
+android-libcore-team+review@google.com
diff --git a/android/version_info/cities1000.zip.headers b/android/version_info/cities1000.zip.headers
index e986923..2776a7a 100644
--- a/android/version_info/cities1000.zip.headers
+++ b/android/version_info/cities1000.zip.headers
@@ -1,9 +1,9 @@
HTTP/1.1 200 OK
-Date: Thu, 29 Jul 2021 13:58:11 GMT
+Date: Tue, 10 Nov 2020 15:08:16 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Thu, 29 Jul 2021 01:06:41 GMT
-ETag: "7a81d5-5c838b7413794"
+Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
+ETag: "7a3aff-5b3b7294a00ab"
Accept-Ranges: bytes
-Content-Length: 8028629
+Content-Length: 8010495
Content-Type: application/zip
diff --git a/android/version_info/cities15000.zip.headers b/android/version_info/cities15000.zip.headers
index e27e73c..fdf8095 100644
--- a/android/version_info/cities15000.zip.headers
+++ b/android/version_info/cities15000.zip.headers
@@ -1,9 +1,9 @@
HTTP/1.1 200 OK
-Date: Thu, 29 Jul 2021 13:58:11 GMT
+Date: Tue, 10 Nov 2020 15:08:17 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Thu, 29 Jul 2021 01:06:41 GMT
-ETag: "23fdcd-5c838b7413794"
+Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
+ETag: "23ec1c-5b3b7294a00ab"
Accept-Ranges: bytes
-Content-Length: 2358733
+Content-Length: 2354204
Content-Type: application/zip
diff --git a/android/version_info/cities500.zip.headers b/android/version_info/cities500.zip.headers
index ce6ab52..5aecd07 100644
--- a/android/version_info/cities500.zip.headers
+++ b/android/version_info/cities500.zip.headers
@@ -1,9 +1,9 @@
HTTP/1.1 200 OK
-Date: Thu, 29 Jul 2021 13:58:11 GMT
+Date: Tue, 10 Nov 2020 15:08:17 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Thu, 29 Jul 2021 01:06:41 GMT
-ETag: "9e73db-5c838b7413794"
+Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
+ETag: "9e2123-5b3b72949fcc3"
Accept-Ranges: bytes
-Content-Length: 10384347
+Content-Length: 10363171
Content-Type: application/zip
diff --git a/android/version_info/cities5000.zip.headers b/android/version_info/cities5000.zip.headers
index 796f2c3..905c76e 100644
--- a/android/version_info/cities5000.zip.headers
+++ b/android/version_info/cities5000.zip.headers
@@ -1,9 +1,9 @@
HTTP/1.1 200 OK
-Date: Thu, 29 Jul 2021 13:58:12 GMT
+Date: Tue, 10 Nov 2020 15:08:17 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Thu, 29 Jul 2021 01:06:41 GMT
-ETag: "3b78fb-5c838b7413794"
+Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
+ETag: "3b5c04-5b3b7294a00ab"
Accept-Ranges: bytes
-Content-Length: 3897595
+Content-Length: 3890180
Content-Type: application/zip
diff --git a/android/version_info/readme.txt.headers b/android/version_info/readme.txt.headers
index 5a6c4ce..1e3520b 100644
--- a/android/version_info/readme.txt.headers
+++ b/android/version_info/readme.txt.headers
@@ -1,8 +1,8 @@
HTTP/1.1 200 OK
-Date: Thu, 29 Jul 2021 13:58:12 GMT
+Date: Tue, 10 Nov 2020 15:08:18 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Thu, 29 Jul 2021 00:55:08 GMT
-ETag: "220c-5c8388de81ce8"
+Last-Modified: Tue, 10 Nov 2020 01:57:35 GMT
+ETag: "220c-5b3b700af88b1"
Accept-Ranges: bytes
Content-Length: 8716
Content-Type: text/plain; charset=utf-8
diff --git a/export/dump/cities1000.zip b/export/dump/cities1000.zip
index 5769491..9c5eb6c 100644
--- a/export/dump/cities1000.zip
+++ b/export/dump/cities1000.zip
Binary files differ
diff --git a/export/dump/cities15000.zip b/export/dump/cities15000.zip
index 0af7919..ef529ab 100644
--- a/export/dump/cities15000.zip
+++ b/export/dump/cities15000.zip
Binary files differ
diff --git a/export/dump/cities500.zip b/export/dump/cities500.zip
index 06264c0..2caf6bc 100644
--- a/export/dump/cities500.zip
+++ b/export/dump/cities500.zip
Binary files differ
diff --git a/export/dump/cities5000.zip b/export/dump/cities5000.zip
index d35e7f9..14edffa 100644
--- a/export/dump/cities5000.zip
+++ b/export/dump/cities5000.zip
Binary files differ
