diff options
| author | 2023-11-15 19:44:18 +0000 | |
|---|---|---|
| committer | 2023-11-15 19:44:18 +0000 | |
| commit | 80dc077c82a400f0ed3dc6dedf475957b2fe34dc (patch) | |
| tree | bfb9d86a6ec41d054606a584da211e8070de9925 /libs/androidfw/FileStream.cpp | |
| parent | 68e1eb8e77df45ce179dd407eef37ceae8687758 (diff) | |
| parent | 0a43e064ec49193c2c744d3703454f196b2cc78e (diff) | |
Merge "LockSettingsService: fix UnlockedDeviceRequired to work without LSKF" into main am: e4dc159215 am: b8b1e09c64 am: 0a43e064ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2806060
Change-Id: I724c8fd8b6bcdae549692a4ba63f31f0ec02c2ce
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