33be46725190778879fd39b46c50a75e4e4fb8ae
e86cdf4ba1 am: 20e1cbc195 -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18763013
Change-Id: I1ddf71d68b801aa8a0cbe4fc08119ce162ad11b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
…
…
…
…
…
…
…
…
…
…
…
…
Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am:
44893b71c0 am: 500d27a12c
…
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%