[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -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: I08f7f5a2b91a7c1a096913f4a083c46e997543e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Victor Berchet

2022-05-02 22:37:13 +00:00

committed by Automerger Merge Worker

parent 203de0f0bc d93fd9dd8e

commit 3020cc3897

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