diff options
| author | 2023-10-04 22:50:30 +0000 | |
|---|---|---|
| committer | 2023-10-04 22:50:30 +0000 | |
| commit | fa1bc4a7efd5d6bb82d215160cefa73918cae54b (patch) | |
| tree | b91b0a641ea2c99af6e01a66c1ecc670b717772f /api/api.go | |
| parent | f92f9ce28764e937b8dd395a3c77c10841659f35 (diff) | |
| parent | 2160024dae7db12f837145ee77842c69d8b62166 (diff) | |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51eac3 -s ours am: 4f2e9968e8 -s ours am: 0ef05eedea -s ours am: 2160024dae -s ours
am skip reason: skipped by user beverlyt
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388
Change-Id: Ic4292b92094f10d8dc321323f5ef9349b6a7aa2c
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