diff options
| author | 2023-10-04 23:39:37 +0000 | |
|---|---|---|
| committer | 2023-10-04 23:39:37 +0000 | |
| commit | ae5f04b5fc0099e68154b970401b6d5f478389a3 (patch) | |
| tree | 2a9e03713b412a795a55f3b35dedc409fb64c92b /libs/androidfw/ObbFile.cpp | |
| parent | 0fa092ace2db8789f11202c5a449027fb82770e7 (diff) | |
| parent | 52a67045bb4e560f317951da5f2a1e12e3b50913 (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: 52a67045bb -s ours
am skip reason: skipped by user beverlyt
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388
Change-Id: If73a6f6652c2e279077f13543f1d2abf860ec80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions