| commit | cd235b97ef55c1bf371841fdeb0fd926b45e7c40 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 22:00:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:00:56 2023 +0000 |
| tree | 3482372e29f773dfa645f76969263812a91b8373 | |
| parent | 65a35c5faea55a8ac57b40473a73634c1c6cb7e1 [diff] | |
| parent | f298d318b2a22e8167f492e6676a1de1af963964 [diff] |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59ac8 -s ours am: 3815edc6e2 -s ours am: 8465fe5d8b -s ours am: 224fa1da3b -s ours am: eca5af7099 -s ours am: a873f5dbd7 -s ours am: f298d318b2 -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: If97eb81798292e42d041d36ac7523b0a2ad56344 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>