Snap for 8426163 from 533cb08bf58c00f2f8d257e6db0b9f37202016ac 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: If36cf3e6c579f9459e03ce48f01aa4c2244bb1fd

2 files changed, 0 insertions, 43 deletions

diff --git a/Android.bp b/Android.bp
index 120b759..e1d62df 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,42 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
-//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
-//     DEPENDING ON IT IN YOUR PROJECT. ***
-package {
-    default_applicable_licenses: [
-        "external_google-fonts_carrois-gothic-sc_license",
-    ],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "external_google-fonts_carrois-gothic-sc_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-OFL", // by exception only
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 prebuilt_font {
     name: "CarroisGothicSC-Regular.ttf",
     src: "CarroisGothicSC-Regular.ttf",
diff --git a/METADATA b/METADATA
deleted file mode 100644
index ffc23d1..0000000
--- a/METADATA
+++ /dev/null
@@ -1,7 +0,0 @@
-# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
-#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
-#     DEPENDING ON IT IN YOUR PROJECT. ***
-third_party {
-  # would be NOTICE save for OFL 1.1 in NOTICE file
-  license_type: BY_EXCEPTION_ONLY
-}