diff options
| author | 2023-10-02 22:33:24 +0000 | |
|---|---|---|
| committer | 2023-10-02 22:33:24 +0000 | |
| commit | 44ce622af0d75e849c9e415440300f9b84f8bae4 (patch) | |
| tree | 967cbe95ed3c2c7eb509aef7ac5d5b65c26ace05 /api/api_test.go | |
| parent | da1ee14f286f121caa811ba5802d860c49bece15 (diff) | |
| parent | bb58a7ab2b0eb5da940ef1d5e7a24fe3513efff8 (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: bb58a7ab2b -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: I795386a1de1794a5bba84f94c7b19074c96f8b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api_test.go')
0 files changed, 0 insertions, 0 deletions