718dba1e242f1b2be22bec64b33150ce6cd54ed0
4d015c710d -s ours am: b93dab4bb9 -s ours am: badff3883f -s ours
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19117578
Change-Id: I1cbe0c0cac5c58067077bdeab56c17ca2d362654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
…
…
…
…
…
…
…
Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am:
279ecc9dc1
…
…
…
…
…
[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%