commit | 3e6f7a7f044b714e90f3c564ca8cbb46cc376081 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 21:18:05 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:18:05 2023 +0000 |
tree | c126fa3c3ec3dc758f8e81c97531efd221df652d | |
parent | 742411fe53c5df089552ab1e12516a9cca151698 [diff] | |
parent | f4b8f6ad2211ba203b80b15f0cd1595eda7c6203 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 727968f0d9 -s ours am: f4b8f6ad22 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: Id8d496930df161271c55e4a68d2bce54901cb0d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>