diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 19:41:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 19:41:19 +0000 |
commit | fffb220a0a695485714a4a9d08f69aaa4bd2e7be (patch) | |
tree | 9e2219da322329cd682cbe07d4bd892dc6eb4b0f | |
parent | bc7b3543d4619f4a9acfe5533ffb858baacd431b (diff) | |
parent | b2c475733c4c267136f802276a78a8c627ea27ae (diff) | |
download | vcard-android12-qpr1-d-release.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/vcard" am: 9222b852ef am: 922d219b10 am: b2c475733candroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-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-devandroid12--mainline-releaseandroid-s-v2-preview-1
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/vcard/+/1589021
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3983d2967fe07ab56eebb9268855ce61086f2d7f
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | tests/Android.bp | 4 |
2 files changed, 8 insertions, 0 deletions
@@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library { name: "com.android.vcard", diff --git a/tests/Android.bp b/tests/Android.bp index 5c286aa..5c49410 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + android_test { name: "AndroidVCardTests", |