diff options
| author | 2023-10-04 23:06:41 +0000 | |
|---|---|---|
| committer | 2023-10-04 23:06:41 +0000 | |
| commit | 52a67045bb4e560f317951da5f2a1e12e3b50913 (patch) | |
| tree | 698a5ec21a3dc600a45d80884715182382ac9a36 /api/api_test.go | |
| parent | 4ed2591d47d515a89930cec1322d35e9d0a01f9a (diff) | |
| parent | 61ecdb33a91ea5d81148f1151e810499a1f9f766 (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: 1efe53e8a6 -s ours am: 61ecdb33a9 -s ours
am skip reason: skipped by user beverlyt
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388
Change-Id: I24703e6be2c559662a05d4b4d53ae5a7f1040a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api_test.go')
0 files changed, 0 insertions, 0 deletions