summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 21:29:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 21:29:42 +0000
commit3d7275980e31d36b76d5ce2587aeb0c821027b25 (patch)
treed5014cb7c3bf919c6251f876dbf2bbb81c63d5c2 /libs/androidfw/ZipFileRO.cpp
parentffd17088e0290f0222301beb869e0c98d1bb131c (diff)
parent42bd09244eb2822b50577d76d9cc6ffbe60ef212 (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: 20b0a7c3ee -s ours am: 1191771679 -s ours am: 42bd09244e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: I883e790ee6368c16a76e49e53fd9875c7fdaa6b4 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