diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 20:11:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 20:11:25 +0000 |
| commit | f465350c4d285fa131629b1e229dfc1bf113d1be (patch) | |
| tree | c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961 | |
| parent | 7bb1f3b0ebe44e28fbd3e34da7e6995d0c7a2d82 (diff) | |
| parent | e195d494a5a8880c8aff2d6495d0d255383f0c58 (diff) | |
| download | calendar-f465350c4d285fa131629b1e229dfc1bf113d1be.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar" am: a097a2b9dd am: 907ed0923b am: 038e536f26 am: e195d494a5android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I472612ac46893a09f4270547c0e65682fa4c691c
| -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", |