| commit | bb58a7ab2b0eb5da940ef1d5e7a24fe3513efff8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 22:23:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:23:21 2023 +0000 |
| tree | 3482372e29f773dfa645f76969263812a91b8373 | |
| parent | 0087df4718da3916f147a3675fec243c10936e7e [diff] | |
| parent | e00bac3a2ed245c32f2be45e99e6579aeea24e10 [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: 627877e431 -s ours am: e00bac3a2e -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: I3a9bc0c506bbe0d23c4adb02bce8276b8ed25be4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>