| commit | 5b142a84ac5c4372ed23bad466fee1f00b027451 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 21:59:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:59:20 2023 +0000 |
| tree | 3482372e29f773dfa645f76969263812a91b8373 | |
| parent | 019c6aa5e9c2160d699f60121cab3916d4d43e53 [diff] | |
| parent | f0ec52791fc12055a6b1e8c80daae0fc7edc83b6 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 3afc843a65 -s ours am: e7ec6b0aa0 -s ours am: 4e0df66dea -s ours am: f0ec52791f -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: Ida9bb5a79aba658547af8078c8a23acda40fe258 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>