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