| commit | 534197a8384f934e35b849fc6f6b9eac9d0a1fbc | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 02 19:49:13 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 19:49:13 2022 +0000 |
| tree | 6c8821772477c3a014284457085582684b983cdb | |
| parent | b9642c4f6b4faa3d053a133e7a8d169238296c3c [diff] | |
| parent | 7db35bb29482bae374357b5269b3babde4e533ea [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: 7db35bb294 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441 Change-Id: I1f4889b66c63e086e3dd8d331bc5985ded478dc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>