| commit | 0087df4718da3916f147a3675fec243c10936e7e | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 22:23:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:23:16 2023 +0000 |
| tree | 3482372e29f773dfa645f76969263812a91b8373 | |
| parent | c5a5f53ffa3187168a39f989bd9fa88737264111 [diff] | |
| parent | d7f94d248efb8ee0dbdbacdaf948862cfdb9d019 [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: f7e217a73f -s ours am: d7f94d248e -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: I547b1fa5e6c9da4b75be3b85124145cd7f6000e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>