158da851e589f89e4370583ebdd37a75622deec5
14d7f081c8 -s ours am: 56822a2cbb -s ours am: 3132e811e3 -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 d262fa6af7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589711
Change-Id: I3708966094997177c24a442e82047fb0534fdd7e
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%