| commit | 627877e43157a7b91d37870c1dd40c90012247ba | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 21:36:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:36:07 2023 +0000 |
| tree | 83b4b49f666116b3794c208fd9a663ca2a33795e | |
| parent | f7e217a73f1542f44b5a372f0ce2d3f9285b16fe [diff] | |
| parent | 742411fe53c5df089552ab1e12516a9cca151698 [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 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: Ib908b5ded7c16efd6e7ab71ee543be6bd6f1645c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>