summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-07 03:46:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-07 03:46:07 +0000
commit39e2a445954e1cb82061de06a77d1235c6964777 (patch)
tree3fe5cef0c19cdcbb1218e2a9e3a7c58995bce817 /libs/androidfw/ZipFileRO.cpp
parent672487c5de99978e331f0da0cb5dbb6590f1dada (diff)
parent675bae26c29f6af7de0a3f8bab0b274d74ea4d69 (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: 0029fc7ce4 -s ours am: 675bae26c2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640919 Change-Id: Ib97f623e14dfe281d64dbcc12d9f594b0eb90b01 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