summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 21:28:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 21:28:52 +0000
commitc8810c3359dde03d9d630b80d67e1a4224e5bcf3 (patch)
treed5014cb7c3bf919c6251f876dbf2bbb81c63d5c2 /libs/androidfw/ZipFileRO.cpp
parent7a0ec745abc595b4897fd2f275539a755c1fa606 (diff)
parent76f4b3526982c4efd6447d437a3b5897d3040bd3 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6ec -s ours am: e4b9774b38 -s ours am: 8c7af994ed -s ours am: 76f4b35269 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: I1314348698173f6c54f696ef042f8c35c6e1bce4 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