df29fca37f7c3f6164c010310a543727456fd981
4bc778ea49 -s ours am: c166e048b1 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: I022a431fc6932160a84cb616df070bd165faaf79
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%