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:10:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-12 21:10:38 +0000
commit850e4bb62f2b943fc899120cbc886b7adf64f3a7 (patch)
tree25045a84f3709c2b9ce42816c9b0ff14b6048e2f /libs/androidfw/FileStream.cpp
parentf62cc6e1ed082bca903db75347dde0476e1c20af (diff)
parent37576c827bb26f177693489124f104ce62ae0c26 (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: 819f8b1180 -s ours am: 37576c827b -s ours
am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d81f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I5d151a7a34b16f1f926e907533bdcfd9018ae2a2 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