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