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-10-10 03:28:21 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-10-10 03:28:21 +0000
commit67b7ac809c4d33d6748b985363b53ec65986028d (patch)
tree087fbef3111eaf7e5554ebbe08806f3be467372c /libs/androidfw/ZipFileRO.cpp
parent06cc3d00c7ecb6ad81dec38b941d98bb802b9998 (diff)
parent03f16e099de27e15ad695e7d8ce504bdcda7c393 (diff)
Merge changes from topic "am-2876cb49a01647d5b9d7e87219b708bf" into udc-dev
* changes: [automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-dev am: 074556ad07 -s ours am: 236f1ec6bd -s ours [automerger skipped] Check URI permissions for resumable media artwork am: a3b7a10a15 -s ours am: 9aac662cab -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions