| commit | 6728cfa75fa94d5f4c5db3dd57828190488e00e9 | [log] [tgz] |
|---|---|---|
| author | Victor Berchet <berchet@google.com> | Tue May 03 00:00:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 03 00:00:55 2022 +0000 |
| tree | 9dea42a69a6b3f9190aa99c0dcf160a104cd892f | |
| parent | d6359a85afc1ca6631b04cdcf834c69ed5e0f593 [diff] | |
| parent | 62a0230994c41a07e0b01e3774a60423996d051a [diff] |
[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I3b3569ac2adb2896b57ae1943b2a0b8ff1f0266e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>