summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 23:47:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 23:47:58 +0000
commit21a65ae5862a3e16105bf905d64fe5268eb3d9a6 (patch)
tree65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/ZipFileRO.cpp
parentaf5e9a6e4e671596cd808de88cedd2baa076e5cd (diff)
parentbc82f11e60309a9ea20cae698b3f14dd95a3ab64 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-qpr-dev am: 0103e3149d -s ours am: f3e578fbc9 -s ours am: 6e5dd607dc -s ours am: 0f25ed8718 -s ours am: e7e81fffc6 -s ours am: 4bedceb967 -s ours am: 4030ae7d27 -s ours am: 260b405795 -s ours am: bc82f11e60 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640916 Change-Id: I8a68761df983ccb9610e269daba915ff1ab8da18 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