summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 21:26:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 21:26:31 +0000
commit50f0866fb933a44ea7f7697751c74439c16b4c97 (patch)
tree8f5db91be35f8bd176c7c6f43255b84c66a66b26 /libs/androidfw/FileStream.cpp
parent7471462f4c176c0830de7318e49d0a0bce1e6d35 (diff)
parent76f4b3526982c4efd6447d437a3b5897d3040bd3 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6ec -s ours am: e4b9774b38 -s ours am: 8c7af994ed -s ours am: 76f4b35269 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: I0f38e983258ec413fcdb9d3b26b77e487500e833 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