| commit | a8428518dd0b07d3548006e01fb0088c1e285e6f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 21:59:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:59:36 2023 +0000 |
| tree | 3482372e29f773dfa645f76969263812a91b8373 | |
| parent | 5b142a84ac5c4372ed23bad466fee1f00b027451 [diff] | |
| parent | 0dd2ab72fa0c4b53da994a52b9de48314bf9b488 [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: 3307ef05ee -s ours am: 742411fe53 -s ours am: f56e799c49 -s ours am: 0dd2ab72fa -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: If9c54b5a05f0422b65ebf1e6c59694fa0c9fe15c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>