cbad093f2dd5f2dd5aba400b86ae86f26a12eaf7
022e537884 -s ours
am skip reason: Merged-In I7ff58a1a9755939ccb26dad61969902ec91f2225 with SHA-1 87bbf2326e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18087662
Change-Id: I23773ddc28c74094f6c1af8a857224a6fa1d33e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am:
08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409
…
…
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%