summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-10-12 20:20:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-12 20:20:43 +0000
commit819f8b11807dc56a438b7db8f17a68e7240a8220 (patch)
treeacb5009ee0efb394fa03ba41526cba26e16e29a1 /libs/androidfw/FileStream.cpp
parent5506fba8b21d2d76eb42e5b32f4b8e542603eab4 (diff)
parent5c2fe7e8a0b28e5b1c8d08cd5ca96313c901a91f (diff)
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2a2 am: ccc748a0d7 am: 2929859166 am: b11212b320 am: 3569c11009 am: 22454204a6 am: 499e70cc52 am: d974f62101 am: 5c2fe7e8a0 -s ours
am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d81f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23835332 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I5162845ffdcde8223357b90e49c7ebfa4481d21c 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