diff options
| author | 2023-10-05 00:30:33 +0000 | |
|---|---|---|
| committer | 2023-10-05 00:30:33 +0000 | |
| commit | 38a00fe9e82c58b8dc92f73ccc58c662ca4520ac (patch) | |
| tree | 20e46bbcc80d62d575cb84db84bd7fc9dc0852cf /api/api.go | |
| parent | 3ceac47a0ad3afc2b5c4dd9e2c9ea4bbe162d46d (diff) | |
| parent | 4eb2d853f9baf951d53d6c3d05392c1981bbcee9 (diff) | |
Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d34974d am: 98df1c6e3f am: 775cbd02d7 am: ae62a32de6 -s ours am: 5200fce012 -s ours am: ad73da7f08 -s ours am: a7ed76fe35 -s ours am: f92f9ce287 -s ours am: 68f052cc9f -s ours" into udc-d1-dev-plus-aosp am: 4eb2d853f9 -s ours
am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 35a6e2f2c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807
Change-Id: I85e05fb774ae4a3e7775acc09fb36dcfb869234d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api.go')
0 files changed, 0 insertions, 0 deletions