| commit | b760217e2bfdb5574ad5d0a66dca02633787a20e | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 02 19:23:21 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 19:23:21 2022 +0000 |
| tree | 397e042738ec438ea55c3a906e8bdd4042edcea2 | |
| parent | 51e63dc87747f3f634e66c73e2ad743b8f89f412 [diff] | |
| parent | 0d3014b9572d202057d7f05d1341076c6f9c5726 [diff] |
[automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours am: 764c1ec926 -s ours am: 583031670c -s ours am: 0d3014b957 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441 Change-Id: Iee5c0293d51a65bef2058cab55fe15500314354a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>