| commit | ae0479380ad6ae1f8dde8a4b3ae839d69d49ac8d | [log] [tgz] |
|---|---|---|
| author | Victor Berchet <berchet@google.com> | Mon May 02 23:01:49 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 23:01:49 2022 +0000 |
| tree | 31fff07d98ad53e3566d7105404432a04241b28c | |
| parent | b15df33926ff4c89dc012c411612a2ce2714f178 [diff] | |
| parent | 3020cc3897bb78e86d806715d5ed3cda7686b169 [diff] |
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I9e265bf6eac9c52fe31f63425fc06147cd3b64ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>