| commit | 47725cbf4c4ba168b8a1c7829d9c96f3ab61f75a | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 02 20:13:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 20:13:17 2022 +0000 |
| tree | 393b84c78615fdb33155637db4a99a86a0238a83 | |
| parent | 91fa7a8d31f6f3d99e62e9c0281d8ce1070e7e61 [diff] | |
| parent | 534197a8384f934e35b849fc6f6b9eac9d0a1fbc [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: 7db35bb294 -s ours am: 534197a838 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441 Change-Id: I65cfb613fcb7869eb3aa405c65b042254c3f3cd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>