[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -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: I59118f2c52abc27a75a25ab9e0306cac396a7606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Victor Berchet

2022-05-02 23:28:43 +00:00

committed by Automerger Merge Worker

parent 62a0230994 4fea97557a

commit 46897fa1e5

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