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