Snap for 7478067 from 21f6a6cf90bf2ed7e27bcf90f7fbd8ce6f785070 to mainline-ipsec-release

Change-Id: Ic2af3b7d6481d708d737330594634757c09499e7
diff --git a/Android.bp b/Android.bp
index c51b357..d4a1660 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,41 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["external_antlr_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_antlr_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-Artistic",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-FSFAP",
+        "SPDX-license-identifier-MIT",
+        "legacy_notice",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 java_library_host {
     name: "antlr-runtime",
     srcs: ["runtime/Java/src/main/java/**/*.java"],
diff --git a/METADATA b/METADATA
index a19780f..f6d8745 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@
     value: "https://github.com/antlr/antlr3/archive/3.5.2.zip"
   }
   version: "3.5.2"
+  license_type: NOTICE
   last_upgrade_date {
     year: 2018
     month: 8