ebfb6f4e10b2cc8095109d6f9bfd17d63b6d2228
4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours am: 3b64b27aab -s ours am: 1b7f3fbccc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140 Change-Id: I370f22b20670389c85416cedecf009cf251d3aaf 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 "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am:
b4ac90f433 am: c5c6a916fe am: 7bed0ed812 am: 1eb5f3a92a am: 7185d7f108
[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%