| commit | 02912212c5014fc65b40946b926457239f98f9b3 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 19:53:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 19:53:44 2023 +0000 |
| tree | fd6fea3a88afc6fad4b23c01fcaf417f97e78da8 | |
| parent | 7dfe94542887e4ce820831433bef78189bf3c1f8 [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: Iffe273097df8a4b91952afdc9419eafb07a46636 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>