3b81e5e226a2a95a1759dabbbc0dee016f727796
7a8d56b2fe am: 271b7fa23c -s ours am: ac571d29c5 -s ours am: 960dc0eb12 -s ours am: 69e95ec77d -s ours am: 0bf90ac6a9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20234866 Change-Id: I854ea2c57ad535f1654909e8718d7206950248da 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 "Add protections against queueing a UsbRequest when the underlying UsbDeviceConnection is closed." into rvc-dev am:
046dc1b7b2 am: a4ebf141dc am: c1c23d0e76 am: 4119e4aef7
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
[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%