summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-07 02:32:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-07 02:32:45 +0000
commit0029fc7ce4908f7e2b86737909ee5c9fe4bd31e0 (patch)
tree65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/ZipFileRO.cpp
parent6cc2cb6fc3216ace286c0407bebfc2f6601325fd (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: I8c5f855cbfd4d7a40c863929bfbc149b19b64d1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions