| commit | 3198390ed55fa11b7d2886d72e9ad7b682ef89db | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 19:50:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 19:50:11 2023 +0000 |
| tree | 2227a9feeb3089bf94951eae69d3a24b0a223fbf | |
| parent | d4d8028001b1c6ebaf3b32543603c9ab62d4e329 [diff] | |
| parent | eaa129138096bc00b663bca93a5af9786aa47154 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae42365 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: Ic915a1a1cf4c99500000cf7620dac85f1e58b092 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>