Snap for 8426163 from a44a0c25fa5eb2575df464bd4d9e3e5c7da9ccf6 to mainline-tzdata2-release
Change-Id: I59f2de658221e8fdfc7db7448f9f20c10b503bf5
diff --git a/Android.bp b/Android.bp
index 610796c..3412b0f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,43 +1,3 @@
-package {
- default_applicable_licenses: ["external_libnetfilter_conntrack_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.
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
- name: "external_libnetfilter_conntrack_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-GPL",
- "SPDX-license-identifier-GPL-2.0",
- "SPDX-license-identifier-LGPL",
- "SPDX-license-identifier-MIT",
- "legacy_notice",
- "legacy_unencumbered",
- ],
- license_text: [
- "COPYING",
- "NOTICE",
- ],
-}
-
sub_srcs = [
"src/main.c",
"src/callback.c",
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 6d8601b..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
- license_type: RESTRICTED
-}