Snap for 8426163 from 213684b54283321a54976eb6ff54426ebbf9c5b4 to mainline-tzdata2-release
Change-Id: I537186da8decc5f3e5cb5c6c4af8816d66d085e7
diff --git a/Android.bp b/Android.bp
index a93470f..12ed461 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_dancing-script_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_dancing-script_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: "DancingScript-Regular.ttf",
src: "DancingScript-Regular.ttf",
@@ -57,8 +21,3 @@
name: "DancingScript-Bold.ttf",
src: "DancingScript-Bold.ttf",
}
-
-filegroup {
- name: "GoogleFontDancingScript",
- srcs: [ "*.ttf" ],
-}
\ No newline at end of file
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
-}
