diff options
| author | 2023-10-05 01:10:52 +0000 | |
|---|---|---|
| committer | 2023-10-05 01:10:52 +0000 | |
| commit | e2c3206a5e1fbc478a718fff9372780b91c3ae8b (patch) | |
| tree | 2b22ee7c60ccc6ddd2731335e891e8394ce4d34e /api/api.go | |
| parent | d0d000f4241cec4b0430c6226d2f7f12ce852894 (diff) | |
| parent | c11374bc09286c266733d9e8734b5abd6b4cc18b (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: fa1bc4a7ef -s ours am: 81c628fcbd -s ours am: ac115aa929 -s ours am: c11374bc09 -s ours
am skip reason: skipped by user beverlyt
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388
Change-Id: I298c29d04048f97b8bd86926920a6bb31a86aed4
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