diff options
| author | 2023-10-04 21:46:34 +0000 | |
|---|---|---|
| committer | 2023-10-04 21:46:34 +0000 | |
| commit | 1efe53e8a6364035fd0729ba80dde7d7c09b8a33 (patch) | |
| tree | 15ee005dd2fd8e3ca9dea4053bf01f5562354fa6 /libs/androidfw/ApkParsing.cpp | |
| parent | fe967cb3b4c6b65d157addb8f3a0699d0f3031bc (diff) | |
| parent | 4f2e9968e8a2566603284bb0101ce2e1f2c2dcd5 (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 skip reason: skipped by user beverlyt
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388
Change-Id: I220cadecfbf921096a0c8f66ef290541339257df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions