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 21:09:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-12 21:09:46 +0000
commit4f91cec854dc807d750b60fee95c045525835609 (patch)
tree3d431a7a9c55078ad2d5dbf5945c0db1d2f89d2e /libs/androidfw/FileStream.cpp
parent08374a95f82361f7a816beaf2121bc47793a60c0 (diff)
parent821eaae435b23c415ca3153599bb78e92bcbbbe0 (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: bf624d549f am: 4422416d9c -s ours am: 4f70c06650 -s ours am: 78e96991b1 -s ours am: 86365047f2 -s ours am: 821eaae435 -s ours
am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8cc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I57effeea0ecb6dc2d4141cff3dba8f8ef82fe408 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