fc09d7afd59834a5e8ebb2fce3e5153a596a98d4
468dd54e8b -s ours am: 1efafda612 -s ours am: adbdf8019e -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: I960c68586ed6ad9fcd13fbd6011ccaca1909d979
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%