Merge SP1A.210222.001

Change-Id: I1cc9a311009c36e8bee8c59fcd2e2dd2248304f7

2 files changed, 26 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index f9afa8a..846c407 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["packages_apps_Music_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "packages_apps_Music_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "Music",
     srcs: ["src/**/*.java"],
diff --git a/kotlin/Android.bp b/kotlin/Android.bp
index 3788111..1eb13de 100644
--- a/kotlin/Android.bp
+++ b/kotlin/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Music_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Music_license"],
+}
+
 android_app {
     name: "MusicKotlin",
     srcs: ["src/**/*.kt"],