summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 23:13:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 23:13:53 +0000
commitbc82f11e60309a9ea20cae698b3f14dd95a3ab64 (patch)
treed5014cb7c3bf919c6251f876dbf2bbb81c63d5c2 /libs/androidfw/ZipFileRO.cpp
parentc7365567798054b135fbac9df9771029487242c8 (diff)
parent260b40579567a90c7290a401c01f0166d8db1d9c (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-qpr-dev am: 0103e3149d -s ours am: f3e578fbc9 -s ours am: 6e5dd607dc -s ours am: 0f25ed8718 -s ours am: e7e81fffc6 -s ours am: 4bedceb967 -s ours am: 4030ae7d27 -s ours am: 260b405795 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640916 Change-Id: I52c3320b39854017b787b20e0f9066a5b9d40132 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