summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nikita Ioffe <ioffe@google.com> 2023-07-29 01:20:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-29 01:20:58 +0000
commit28e5a529814948c50c18f665bacaa41123d5cb0c (patch)
tree1b338f61d2c68b5bf1dc8f45cac2f5fbeb713a19 /libs/androidfw/FileStream.cpp
parent6684375715925717f4be4cc236127c4744d3a561 (diff)
parentaff194604f6e5da13ea08ffb5e04ee0cece1cc2b (diff)
Merge changes from topics "cherrypick-non-staged-flag-ussa3zkzzhp", "forced-non-staged-apex-update-udc-dev-plus-aosp" into udc-dev-plus-aosp am: aff194604f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24224464 Change-Id: Ia3a259446f82f4172f885f6a330d3827513af474 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