ec29d4fe985995545403fb55d6ab2b37f4221f52
468dd54e8b -s ours am: 1efafda612 -s ours am: adbdf8019e -s ours am: fc09d7afd5 -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: Ife9fa12293e03f1b239fedbd886cc1d29fc62a41
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 "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am:
279ecc9dc1 am: 37dc894a6f
…
…
…
…
…
[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%