a47f079f4f19dda8e02b525bff439375e235cec7
0c000c879a am: 10166d3457 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706 Change-Id: I4ea521c1e96b807c00d36afa484ef84a62f02ccb 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 "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Fix a security issue in app widget service." into qt-dev am:
5a292b8bf4 am: f90c770087 am: af809557f8 am: 1dd381ac4a am: ef489b0fec am: e6d0a468f9
[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%