| commit | 521946768c4531e6a2c9e5dbf0859b7d5dc74b1b | [log] [tgz] |
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Jul 15 01:31:04 2021 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Jul 15 01:31:04 2021 +0000 |
| tree | 9540763a308d33806006c230406ecf422f346b50 | |
| parent | 3b9fc994c7ec52c403a8d30ceb08ca29b3579c52 [diff] | |
| parent | 2960d59103e9ca7c17f6a3af765b6edeb7309538 [diff] |
Snap for 7550844 from 2960d59103e9ca7c17f6a3af765b6edeb7309538 to mainline-conscrypt-release Change-Id: I23d3c549c21323befd4a2da1132be71eb9d2d5d3
diff --git a/Android.bp b/Android.bp index d796605..8efba48 100644 --- a/Android.bp +++ b/Android.bp
@@ -1,3 +1,7 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_import_host { name: "manifest-merger-jars", jars: [