210bab229f1b79ba61ba9bf38e08ddef3b28cef3
caa5a22ea0 -s ours am: 2ee5edda84 -s ours am: 39711c9dd7 -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081c8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577100
Change-Id: I39fd8aae76294148f1ae29fd366840c4eb490223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
…
…
…
…
…
…
…
…
…
…
…
…
…
…
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%