diff options
| author | 2023-10-04 23:40:14 +0000 | |
|---|---|---|
| committer | 2023-10-04 23:40:14 +0000 | |
| commit | bc0c162c66d50bc3ceb943e8592aeec7ec64ecd3 (patch) | |
| tree | 60ae8ec41b8d16efc920e9bc97d5bfdd80c68503 /api/api.go | |
| parent | 34539a4dcdea42a15af7a9f1ad0cb7292da729e3 (diff) | |
| parent | 912d2a7bbe3e25a32d1192c9c8df349a6e471b39 (diff) | |
[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: 9b4ab43d7b -s ours am: 0b5a34c257 -s ours am: 896c255adf -s ours am: 912d2a7bbe -s ours
am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807
Change-Id: If2a3093e1bcad008d4d66a34a0d6d17462adfd84
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