| commit | 65a91f301404b145bdaf3b027fdf7e28821b8a7c | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 22:08:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:08:29 2023 +0000 |
| tree | 3482372e29f773dfa645f76969263812a91b8373 | |
| parent | 7b474f9d1378322e3b71aed7a2f3416a1bb6354a [diff] | |
| parent | 6b43a383455a7284701207a9ef9f6198acc15ddf [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: 3e6f7a7f04 -s ours am: 155481e1e9 -s ours am: 6b43a38345 -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: Ia5280f39715d20c2ec5926285517bcc9ea24ac69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>