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