Snap for 8564071 from 4b3b986512b965dcd954efc8d5d0aed074fc80fc to mainline-permission-releaseaml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030android13-mainline-permission-release

Change-Id: I697c462ea6c65c6dbc9c2234cb9c9c0e605c2983

11 files changed, 28 insertions, 29 deletions

diff --git a/METADATA b/METADATA
index 844839e..ec590f4 100644
--- a/METADATA
+++ b/METADATA
@@ -11,25 +11,25 @@ third_party {
   }
   url {
     type: OTHER
-    value: "Downloaded from https://download.geonames.org/export/dump/cities1000.zip on 2020-11-10, SHA1=f293844bc9bec4638dfa60ed28a4cfd2562e0244, see android/version_info/cities1000.zip.headers"
+    value: "Downloaded from https://download.geonames.org/export/dump/cities1000.zip on 2021-07-29, SHA1=4a3ee08e4dd21c7fc136826c0fd4b96b7003103a, see android/version_info/cities1000.zip.headers"
   }
   url {
     type: OTHER
-    value: "Downloaded from https://download.geonames.org/export/dump/cities15000.zip on 2020-11-10, SHA1=c9a6e27be706285e93f074906248802e6e8cc737, see android/version_info/cities15000.zip.headers"
+    value: "Downloaded from https://download.geonames.org/export/dump/cities15000.zip on 2021-07-29, SHA1=c27eb93f78f5bad551e293a4afcd7321ada28b99, see android/version_info/cities15000.zip.headers"
   }
   url {
     type: OTHER
-    value: "Downloaded from https://download.geonames.org/export/dump/cities500.zip on 2020-11-10, SHA1=69a244fc1d97b637596752c6aa8b860c731667d8, see android/version_info/cities500.zip.headers"
+    value: "Downloaded from https://download.geonames.org/export/dump/cities500.zip on 2021-07-29, SHA1=f4baae40e1e4d7bfd21ee4910e583d87ed2b87f1, see android/version_info/cities500.zip.headers"
   }
   url {
     type: OTHER
-    value: "Downloaded from https://download.geonames.org/export/dump/cities5000.zip on 2020-11-10, SHA1=9da4ddf0bd4802794c946484ce578780a2b60c44, see android/version_info/cities5000.zip.headers"
+    value: "Downloaded from https://download.geonames.org/export/dump/cities5000.zip on 2021-07-29, SHA1=43007a9d0c43645dbbf5b88e09479fe9698a2b8b, see android/version_info/cities5000.zip.headers"
   }
   url {
     type: OTHER
-    value: "Downloaded from https://download.geonames.org/export/dump/readme.txt on 2020-11-10, SHA1=7dc17472faed8f71aebc3e4cf22af181ef2002fe, see android/version_info/readme.txt.headers"
+    value: "Downloaded from https://download.geonames.org/export/dump/readme.txt on 2021-07-29, SHA1=7dc17472faed8f71aebc3e4cf22af181ef2002fe, see android/version_info/readme.txt.headers"
   }
-  version: "As of 2020-11-10"
-  last_upgrade_date { year: 2020 month: 11 day: 10 }
+  version: "As of 2021-07-29"
+  last_upgrade_date { year: 2021 month: 7 day: 29 }
   license_type: NOTICE
 }
diff --git a/OWNERS b/OWNERS
index 2f5a957..d9e25b0 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,2 @@
-nfuller@google.com
-vichang@google.com
-android-libcore-team+review@google.com
+# Component ID: 847766
+include platform/packages/modules/GeoTZ:/OWNERS
diff --git a/android/version_info/cities1000.zip.headers b/android/version_info/cities1000.zip.headers
index 2776a7a..e986923 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: Tue, 10 Nov 2020 15:08:16 GMT

+Date: Thu, 29 Jul 2021 13:58:11 GMT

 Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips

-Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT

-ETag: "7a3aff-5b3b7294a00ab"

+Last-Modified: Thu, 29 Jul 2021 01:06:41 GMT

+ETag: "7a81d5-5c838b7413794"

 Accept-Ranges: bytes

-Content-Length: 8010495

+Content-Length: 8028629

 Content-Type: application/zip

 

diff --git a/android/version_info/cities15000.zip.headers b/android/version_info/cities15000.zip.headers
index fdf8095..e27e73c 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: Tue, 10 Nov 2020 15:08:17 GMT

+Date: Thu, 29 Jul 2021 13:58:11 GMT

 Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips

-Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT

-ETag: "23ec1c-5b3b7294a00ab"

+Last-Modified: Thu, 29 Jul 2021 01:06:41 GMT

+ETag: "23fdcd-5c838b7413794"

 Accept-Ranges: bytes

-Content-Length: 2354204

+Content-Length: 2358733

 Content-Type: application/zip

 

diff --git a/android/version_info/cities500.zip.headers b/android/version_info/cities500.zip.headers
index 5aecd07..ce6ab52 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: Tue, 10 Nov 2020 15:08:17 GMT

+Date: Thu, 29 Jul 2021 13:58:11 GMT

 Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips

-Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT

-ETag: "9e2123-5b3b72949fcc3"

+Last-Modified: Thu, 29 Jul 2021 01:06:41 GMT

+ETag: "9e73db-5c838b7413794"

 Accept-Ranges: bytes

-Content-Length: 10363171

+Content-Length: 10384347

 Content-Type: application/zip

 

diff --git a/android/version_info/cities5000.zip.headers b/android/version_info/cities5000.zip.headers
index 905c76e..796f2c3 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: Tue, 10 Nov 2020 15:08:17 GMT

+Date: Thu, 29 Jul 2021 13:58:12 GMT

 Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips

-Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT

-ETag: "3b5c04-5b3b7294a00ab"

+Last-Modified: Thu, 29 Jul 2021 01:06:41 GMT

+ETag: "3b78fb-5c838b7413794"

 Accept-Ranges: bytes

-Content-Length: 3890180

+Content-Length: 3897595

 Content-Type: application/zip

 

diff --git a/android/version_info/readme.txt.headers b/android/version_info/readme.txt.headers
index 1e3520b..5a6c4ce 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: Tue, 10 Nov 2020 15:08:18 GMT

+Date: Thu, 29 Jul 2021 13:58:12 GMT

 Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips

-Last-Modified: Tue, 10 Nov 2020 01:57:35 GMT

-ETag: "220c-5b3b700af88b1"

+Last-Modified: Thu, 29 Jul 2021 00:55:08 GMT

+ETag: "220c-5c8388de81ce8"

 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 9c5eb6c..5769491 100644
--- a/export/dump/cities1000.zip
+++ b/export/dump/cities1000.zip
diff --git a/export/dump/cities15000.zip b/export/dump/cities15000.zip
index ef529ab..0af7919 100644
--- a/export/dump/cities15000.zip
+++ b/export/dump/cities15000.zip
diff --git a/export/dump/cities500.zip b/export/dump/cities500.zip
index 2caf6bc..06264c0 100644
--- a/export/dump/cities500.zip
+++ b/export/dump/cities500.zip
diff --git a/export/dump/cities5000.zip b/export/dump/cities5000.zip
index 14edffa..d35e7f9 100644
--- a/export/dump/cities5000.zip
+++ b/export/dump/cities5000.zip