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