| commit | 65a35c5faea55a8ac57b40473a73634c1c6cb7e1 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 22:00:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:00:33 2023 +0000 |
| tree | 3482372e29f773dfa645f76969263812a91b8373 | |
| parent | a8428518dd0b07d3548006e01fb0088c1e285e6f [diff] | |
| parent | f6ed64e1ab57e0a8a199dc5c1d253f61450f9155 [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: f6ed64e1ab -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: I65b9e9bd8aae0e30a28ab8a4f8e81812e0ed814a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>