commit | 83b4fadcb7666811327b654ebdc55035b6e4e4f8 | [log] [tgz] |
---|---|---|
author | Victor Berchet <berchet@google.com> | Mon May 02 22:37:19 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 22:37:19 2022 +0000 |
tree | e905a15bebac18dada76139a64e75d30eec3bf01 | |
parent | 3020cc3897bb78e86d806715d5ed3cda7686b169 [diff] | |
parent | 938c647b7a8647f6fc21fcb86c79f03cc70cdc57 [diff] |
[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I31a2312fc7520654a27fe3736c55650746c744d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>