summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 23:47:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 23:47:46 +0000
commit21a3b06cb0c721a1b8aa8f0f3008f4c08369760d (patch)
tree65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/ZipFileRO.cpp
parent4ef26ddeaffc2871a822ca661b8c44d962efe8d4 (diff)
parentb0c6f9193b20a8fe97a9d6d7a1dfecabef2d57be (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: b0c6f9193b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640916 Change-Id: I1fcfe2e98950dcefeb2b011dd7122f0276163442 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