| commit | 7db35bb29482bae374357b5269b3babde4e533ea | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 02 19:24:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 19:24:14 2022 +0000 |
| tree | 32d6d2960a61135a84f26f9a4d33ea6f6972a0cb | |
| parent | cbad093f2dd5f2dd5aba400b86ae86f26a12eaf7 [diff] | |
| parent | 0d3014b9572d202057d7f05d1341076c6f9c5726 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441 Change-Id: I9b0ed702618c356a409e6c1abc96d8f7a5b66832 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>