1da6986a7458fde47f8a6fe6bace75efce71ab3b
455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943
Change-Id: If6036a42358bb91cbe2580d1cc2eb19422b0b618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
[automerge] DO NOT MERGE: Revert "Make CheckOp return allowed if any attr tag for a package is excluded" 2p:
de7b0f6dd0
…
…
…
…
…
…
…
…
…
…
…
…
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am:
08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409
[conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am:
0d2e7006ce
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%