| commit | abc0fd6965195515d1f0adb024aa5eb33435a79a | [log] [tgz] |
|---|---|---|
| author | Victor Berchet <berchet@google.com> | Tue May 03 00:00:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 03 00:00:58 2022 +0000 |
| tree | 6c8821772477c3a014284457085582684b983cdb | |
| parent | 6c453ab37202c1ff38d737d052ddd4f150a3ce8e [diff] | |
| parent | 56f74b2e6e4a4d81dae761518cdcd22980ce91b4 [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: 56f74b2e6e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: Id1c455a1c9f5109318455e8f8ed0868e5d9bf6e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>