summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-07 02:19:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-07 02:19:09 +0000
commit0e1e02ad718c3e2afa120cd18ab77f12a7a0ae80 (patch)
tree65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/ZipFileRO.cpp
parentb2e2887a202fb097651b8c59696efb82bff270c2 (diff)
parent6fd2aa27c54b8264b86face9b3cc61865a4bc17f (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: 6008c6155f -s ours am: 40a74a7b70 -s ours am: 10a0cf5e70 -s ours am: 6fd2aa27c5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640919 Change-Id: I1f7799889741a1c0773bd4c39759a57af0527213 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