Snap for 7550640 from f60bde8f9f405d5123b910d0d4e303b2629fdfe9 to mainline-wifi-release

Change-Id: Ifa367a1e18bed87c3046c5c552da31bc1e441ac9
diff --git a/Android.bp b/Android.bp
index 19deb85..c3f6393 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,33 @@
+package {
+    default_applicable_licenses: ["external_ksoap2_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_ksoap2_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 java_library {
     name: "ksoap2",
     sdk_version: "system_current",
diff --git a/METADATA b/METADATA
index 04d2d33..9bff74f 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@
     value: "https://github.com/simpligility/ksoap2-android/archive/3.0.0-RC.2.zip"
   }
   version: "bf4e67df641c386cbd91ddae5db7f3c49956a55b"
+  license_type: NOTICE
   last_upgrade_date {
     year: 2014
     month: 5