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:13:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-12 21:13:37 +0000
commit229e17eb42fbd23ea41a65799b22a6371374d740 (patch)
tree25045a84f3709c2b9ce42816c9b0ff14b6048e2f /libs/androidfw/FileStream.cpp
parent8e4ab154e37ff64fe844d4bfcd1eab0b95e180b6 (diff)
parentef13104cd3d08cfe70dba5330f8d748ea3fa9f00 (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: ac863a9b6e -s ours am: ef13104cd3 -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: I6ee85666b8944cf136f58923901c8785447986fa 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