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