summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-07 03:07:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-07 03:07:40 +0000
commit623d6c24b8c10afb48215747438c69167d8f184f (patch)
treee7fff69801efa413e095710daae75f68561ff25c /libs/androidfw/ZipFileRO.cpp
parentafd5efed69d3fb58548ea92a1f18664dfdeefbe5 (diff)
parent7100d34ebd26084e51d7fba9932e2368dd6c84d8 (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: b83e47f389 -s ours am: 7100d34ebd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640919 Change-Id: I35abd5dcdc504e3998ba421a153c0f2ba47b51c6 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