| commit | 40f36e945904116df4a40945a747452b779ab2b2 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Sep 18 18:02:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:02:06 2023 +0000 |
| tree | c7c054ed5e6ad42c82358780e24f07d5c7879773 | |
| parent | 01937609568e1521dce5b83448c8a5098c902b2f [diff] | |
| parent | 1d85542ea3ca8bb9e2f849daa6a160ed2e0e9b3f [diff] |
Merge "Revert "On device lockdown, always show the keyguard"" into udc-qpr-dev am: 971b800cf0 am: 1d85542ea3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24755145 Change-Id: I5bc7590075173169808e75a9076f282de30f448b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>