commit | c410410d1cab06afb235c5b59296ad7c83fc90a9 | [log] [tgz] |
---|---|---|
author | Victor Berchet <berchet@google.com> | Tue May 03 00:32:29 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 03 00:32:29 2022 +0000 |
tree | 9dea42a69a6b3f9190aa99c0dcf160a104cd892f | |
parent | 91ee25485058b5ef4751bfa0d5942aa2cb452029 [diff] | |
parent | bcf1533d3091f5de609e5a45bfd5b48e782d1fc7 [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: aeecad4897 -s ours am: bcf1533d30 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I0351da37a4897a693335f9ab6a2878ce370c7b93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>