db05a438605fa2922df17931b02bce00d588f975
d386543a34 -s ours
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694
Change-Id: I210b6bf48048fd03452640de18ca8a6c0014a599
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 "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%