53f19e615b7719e5f134bc48dddbc11407dfea53
c59352ed18 -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459103
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959
Change-Id: I4f4b03ae8aee39d135571ec0decc055af54d0a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
…
…
…
…
…
…
…
…
…
Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev am:
53738ccfb3
…
…
…
…
…
[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%