| commit | 46897fa1e5f4d0ae81ceddb9d123b95fa53626b1 | [log] [tgz] |
|---|---|---|
| author | Victor Berchet <berchet@google.com> | Mon May 02 23:28:43 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 23:28:43 2022 +0000 |
| tree | 397e042738ec438ea55c3a906e8bdd4042edcea2 | |
| parent | 62a0230994c41a07e0b01e3774a60423996d051a [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: I59118f2c52abc27a75a25ab9e0306cac396a7606 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>