c39d9728d61b027ae464718e431092ab89cb154e
74a6adb8e0 -s ours
am skip reason: Merged-In Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0 with SHA-1 b0b2863467 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18907107
Change-Id: Icbdb2192ef3326a81dc712393a40c6469654eb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
…
…
…
…
…
…
…
…
…
…
…
…
Ignore tests in RecoverableKeyStoreManagerTest am:
4220de4d5b am: a4924eb85c am: 3a2171f668 am: e813a20711 am: 1554a00af4 am: 393f58bfde am: a132abb4ca
…
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%