d46ebb9419db3ab8b34ff440d43ca4e0c4576deb
459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3 am: c3cde6206d am: 926e1629cb am: ce4b0d45ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519 Change-Id: I4d7dccbd1962f43c882993933ed96ebdc1fd8946 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am:
950fb419e7
Merge "Fix a security issue in app widget service." into qt-dev am:
5a292b8bf4 am: f90c770087 am: af809557f8 am: 1dd381ac4a am: ef489b0fec am: e6d0a468f9
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev am:
a30bf19d1c
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am:
459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3 am: c3cde6206d am: 926e1629cb am: ce4b0d45ac
[conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am:
0d2e7006ce
…
…
Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am:
b82853357b am: 89aedd6cb8 am: af77c134d9
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%