| commit | 56f74b2e6e4a4d81dae761518cdcd22980ce91b4 | [log] [tgz] |
|---|---|---|
| author | Victor Berchet <berchet@google.com> | Mon May 02 23:29:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 23:29:32 2022 +0000 |
| tree | 32d6d2960a61135a84f26f9a4d33ea6f6972a0cb | |
| parent | 4da2a453382dd3455b417ed38cb94de8e4e2099c [diff] | |
| parent | ae0479380ad6ae1f8dde8a4b3ae839d69d49ac8d [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I5b2dc3b08f41fcc64196de6e94d1d921da0cb8dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>