[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -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: I86c387fdcbbc16923d096af5795c168c1a853a5c
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:13:01 +00:00

committed by Automerger Merge Worker

parent 548bf8cc64 a492c2f2d9

commit d93fd9dd8e

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