diff options
| author | 2023-10-03 18:17:41 +0000 | |
|---|---|---|
| committer | 2023-10-03 18:17:41 +0000 | |
| commit | 8efa785f9bc51ab78c767f599075f9e354968339 (patch) | |
| tree | d14aa67e88c9513613197436ae2992cf959fe678 /libs/androidfw/ObbFile.cpp | |
| parent | 782e7bc3e23dc285f51b7eb0af909e1ccb3ed801 (diff) | |
| parent | af9de2e62c3a2d2c4be11c7b1170758cdf731c89 (diff) | |
Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9f1 am: 4f8e0db44f am: af9de2e62c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005
Change-Id: If7d9943b1dc2ffe6fc6aa0fb2fb23b2a05e8bf9e
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