summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-11-15 19:08:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-15 19:08:11 +0000
commitad50787f6817213dcf65bc9849cba5e2229a9816 (patch)
tree4ec098b8bd6b312495ca77ce402e0f2288ffe4a0 /libs/androidfw/FileStream.cpp
parent0a43e064ec49193c2c744d3703454f196b2cc78e (diff)
parent1014e464d3ac23d49d753919a19c7d626d5ea364 (diff)
Merge "LockSettingsService: fix UnlockedDeviceRequired to work without LSKF" into main am: e4dc159215 am: 1014e464d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2806060 Change-Id: If5ce399723cdcb2d5cd540678176696d0fe91dc0 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