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