diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 19:41:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 19:41:12 +0000 |
| commit | e195d494a5a8880c8aff2d6495d0d255383f0c58 (patch) | |
| tree | c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961 | |
| parent | 7bb1f3b0ebe44e28fbd3e34da7e6995d0c7a2d82 (diff) | |
| parent | 038e536f263c6ff65ad6bc4355fd99388651504d (diff) | |
| download | calendar-e195d494a5a8880c8aff2d6495d0d255383f0c58.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar" am: a097a2b9dd am: 907ed0923b am: 038e536f26android-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-release
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3187fe574f21977fa8006ab92072636f2ee110ce
| -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: "calendar-common", sdk_version: "15", diff --git a/tests/Android.bp b/tests/Android.bp index cdda049..938b51c 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: "CalendarCommonTests", sdk_version: "current", |