[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 62a0230994 -s ours am: 6728cfa75f -s ours am: 7f53a79ac3 -s ours

Browse Source

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Iaaa3b9e5040d342c0f1e09914316c5b7c9b65a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Victor Berchet

2022-05-03 02:22:31 +00:00

committed by Automerger Merge Worker

parent e060e7d02a 7f53a79ac3

commit 3760358c7b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available