summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-06 19:18:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-06 19:18:13 +0000
commit74002ce45f97f3cf709cc5204dbf82aa21b20162 (patch)
tree7bdff60f43d3ff8626e9e604036308b18e62ef79 /libs/androidfw/ZipFileRO.cpp
parent5b9d09f412c082142fef233a670e1f531cbdc80a (diff)
parent248b865b2afae485b67d14919d1d808f29e7eb66 (diff)
Merge "[automerger skipped] DO NOT MERGE Revert "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." am: 28428b7379 am: 85c45c918b -s ours am: 0b8ee56a4b -s ours am: 2ab6f65039 -s ours am: f44b7b5aff -s ours am: 1a2f99d71d -s ours am: 6bdeda9e44 -s ours" into udc-qpr-dev am: 09ca6c17aa am: 248b865b2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23891747 Change-Id: I62cb5c047ba3994ae69ce863b5626497bb72243d 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