diff options
| author | 2023-10-05 01:11:02 +0000 | |
|---|---|---|
| committer | 2023-10-05 01:11:02 +0000 | |
| commit | f93f496fd04e2ab6cb545bfa9616481bfcff21e8 (patch) | |
| tree | 2b22ee7c60ccc6ddd2731335e891e8394ce4d34e /api/api.go | |
| parent | e2c3206a5e1fbc478a718fff9372780b91c3ae8b (diff) | |
| parent | d5ae6e41b6277afb99c08d129bcc2417515f1a1a (diff) | |
Merge "[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" into udc-d1-dev-plus-aosp am: 34539a4dcd -s ours am: d5ae6e41b6 -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/+/24805388
Change-Id: If341b21acf517444fb6726fb0a7f0bbffc0d3e49
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