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