summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-07 01:59:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-07 01:59:26 +0000
commit37193043e772d3056d117947666a8717863ffd4c (patch)
tree8f5db91be35f8bd176c7c6f43255b84c66a66b26 /libs/androidfw/ZipFileRO.cpp
parent3fae19abefe94f56495ae518cb7f11e573ba3532 (diff)
parent459e0fbeb5c63f2076269ae88ce370e723e1cefc (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640919 Change-Id: I30df9e00a5d7d092390442864b9d85f1f221a2ae 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