Snap for 8426163 from 78482fac37d6b220eece50a4cb17e8e41215d14e to mainline-tzdata2-release
Change-Id: Ie37463c4655db6d5b56854a0a32460452d6aca6b
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index b7bec25..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// Copyright (C) 2020 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// 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_karla_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_karla_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-OFL", // by exception only
- ],
- license_text: [
- "LICENSE",
- ],
-}
-
-prebuilt_font {
- name: "Karla-Regular.ttf",
- src: "Karla-Regular.ttf",
- product_specific: true,
-}
-
diff --git a/fonts/Karla-Bold.ttf b/Karla-Bold.ttf
similarity index 100%
rename from fonts/Karla-Bold.ttf
rename to Karla-Bold.ttf
Binary files differ
diff --git a/fonts/Karla-BoldItalic.ttf b/Karla-BoldItalic.ttf
similarity index 100%
rename from fonts/Karla-BoldItalic.ttf
rename to Karla-BoldItalic.ttf
Binary files differ
diff --git a/fonts/Karla-Italic.ttf b/Karla-Italic.ttf
similarity index 100%
rename from fonts/Karla-Italic.ttf
rename to Karla-Italic.ttf
Binary files differ
diff --git a/README b/README
deleted file mode 100644
index d5a4b3b..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-the ./fonts directory contain unused fonts.
diff --git a/fonts.mk b/fonts.mk
deleted file mode 100644
index fc7fcb9..0000000
--- a/fonts.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Copyright (C) 2020 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-PRODUCT_PACKAGES += \
- Karla-Regular.ttf
