diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-21 19:04:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-21 19:04:34 +0000 |
| commit | 096c0af2988a78c6d84982bc9f7ed2944d59f349 (patch) | |
| tree | 9eed57a5bead6f8282b6aa5c19c892e3a184dbb9 | |
| parent | 9c3b541b4357011de2047a2e24f92a63c6d8d8a0 (diff) | |
| parent | d2385fcb9a6e97e422d2b144771dc6103c1b96f1 (diff) | |
| download | PartnerBookmarksProvider-android12-qpr3-s1-release.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/PartnerBookmarksProvider" am: 6a44d03392 am: 3d3d1ccaca am: d2385fcb9aandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/packages/providers/PartnerBookmarksProvider/+/1588553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91ac68134369c63c5de16f435b87bb4e5ebb47c9
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | tests/Android.bp | 4 |
2 files changed, 8 insertions, 0 deletions
@@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + android_app { name: "PartnerBookmarksProvider", static_libs: ["android-common"], diff --git a/tests/Android.bp b/tests/Android.bp index 6f1eac2..3c2cb6a 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + android_test { name: "PartnerBookmarksProviderTest", // Include all test java files. |