| commit | 938c647b7a8647f6fc21fcb86c79f03cc70cdc57 | [log] [tgz] |
|---|---|---|
| author | Victor Berchet <berchet@google.com> | Mon May 02 22:13:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 22:13:11 2022 +0000 |
| tree | e59caca38b10cd7f1552cf09b50a433c0a1527e4 | |
| parent | d93fd9dd8e3a8d7971bde779628cf2b064a4dc73 [diff] | |
| parent | f44dc5cee30935d832d4e7f55e5d14cc8a69aedc [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I3201f14b5a79528eec09c5eb5d6d4647d32597d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>