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