f2b5cf274c67691ac0daa02a6a936ab598ff379a
95267eaf87 -s ours
am skip reason: Merged-In Iae1a66165221f45051be17c4d047b5bd5be3999b with SHA-1 c7fda7b570 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2058929
Change-Id: I2ef00440a4935d88da004b94f50a69a493606358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
[automerge] [SC][RESTRICT AUTOMERGE]Update telemetry service permission name in allowlists 2p:
827dacd408
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%