diff options
| author | 2023-11-15 19:45:43 +0000 | |
|---|---|---|
| committer | 2023-11-15 19:45:43 +0000 | |
| commit | 6947720e40b0b566cec222163e11de73510dcc20 (patch) | |
| tree | bfb9d86a6ec41d054606a584da211e8070de9925 /libs/androidfw/FileStream.cpp | |
| parent | 80dc077c82a400f0ed3dc6dedf475957b2fe34dc (diff) | |
| parent | ad50787f6817213dcf65bc9849cba5e2229a9816 (diff) | |
Merge "LockSettingsService: fix UnlockedDeviceRequired to work without LSKF" into main am: e4dc159215 am: 1014e464d3 am: ad50787f68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2806060
Change-Id: Ib5357da121de7ece186a6d8c295bb14d6e0079a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions