Snap for 8426163 from dde1f798dc5758bd96c2b0613a2fe0940249c9f0 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: If4f7cc05307a833d2e4824e2153aeecaaf222ad5

3 files changed, 1 insertions, 25 deletions

diff --git a/Android.bp b/Android.bp
index 27f1614..aa75e58 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,22 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["external_fdlibm_license"],
-}
-
-// Added automatically by a large-scale-change
-license {
-    name: "external_fdlibm_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 cc_library_static {
     name: "libfdlibm",
     host_supported: true,
@@ -146,8 +130,7 @@ cc_library_static {
     ],
 
     apex_available: [
-        "com.android.art",
+        "com.android.art.release",
         "com.android.art.debug",
     ],
-    min_sdk_version: "S",
 }
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/OWNERS b/OWNERS
index 2682388..7529e13 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,7 +2,3 @@
 # Please update this list if you find better candidates.
 enh@google.com
 narayan@google.com
-dauletz@google.com
-oth@google.com
-hboehm@google.com
-ngeoffray@google.com