5354054d12a24ca7d05b0b0ba96c8efb6fc0bbb4
39357500b7 -s ours am: 1afdf37316 -s ours
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20346939
Change-Id: I6ff27e2d1318aac7a78609a1ec48614ccf6dba7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am:
950fb419e7
…
…
…
Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am:
4937db2448
…
…
…
…
…
…
…
…
…
…
…
…
…
…
…
[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%