diff options
| author | 2023-10-04 23:08:42 +0000 | |
|---|---|---|
| committer | 2023-10-04 23:08:42 +0000 | |
| commit | 68f052cc9f9d2cfded599d9b8f8f5fa8a351bffa (patch) | |
| tree | 0f2387bae50c81079bd2e3acaee7b9d14c190793 /api/api.go | |
| parent | 75564c4cfdfe8b307a37e236226e0115aae347f5 (diff) | |
| parent | f92f9ce28764e937b8dd395a3c77c10841659f35 (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: a7ed76fe35 -s ours am: f92f9ce287 -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: Ibf1d1245621f0d756418b37bf5c494356aeab300
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