commit | 3020cc3897bb78e86d806715d5ed3cda7686b169 | [log] [tgz] |
---|---|---|
author | Victor Berchet <berchet@google.com> | Mon May 02 22:37:13 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 22:37:13 2022 +0000 |
tree | e905a15bebac18dada76139a64e75d30eec3bf01 | |
parent | 203de0f0bcd5c3c9d22c80d9ea841c795ad2c921 [diff] | |
parent | d93fd9dd8e3a8d7971bde779628cf2b064a4dc73 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I08f7f5a2b91a7c1a096913f4a083c46e997543e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>