| commit | 0d3014b9572d202057d7f05d1341076c6f9c5726 | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 02 18:57:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 18:57:30 2022 +0000 |
| tree | 31fff07d98ad53e3566d7105404432a04241b28c | |
| parent | 022e5378849a03534d2f3ec275c980aefacb98b1 [diff] | |
| parent | 583031670cdc91aa1f8dec998bd24464701807a9 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441 Change-Id: I85fcce746af8013ed9cca302a8db0460334384a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>