summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-07 02:33:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-07 02:33:58 +0000
commit9f6230f5a7d742e166ad74cfc13b1247035c1a5b (patch)
treeeafd173836eaefb34afcb9469f4516c5a4a0f176 /libs/androidfw/FileStream.cpp
parent0832cf9721177be835fafb5011ae41dd4e95bb65 (diff)
parent37193043e772d3056d117947666a8717863ffd4c (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-dev am: e48d7291ca -s ours am: 2d941b0818 -s ours am: 99ae21062a -s ours am: b9ab54d757 -s ours am: 4dd7b2cfb9 -s ours am: 1cb821baf5 -s ours am: 73f12505fc -s ours am: 459e0fbeb5 -s ours am: 37193043e7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640919 Change-Id: I50aab5b9dd8a653e74bab610deb5f3f520486c59 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