summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-05 17:12:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-05 17:12:08 +0000
commit362d9442f30e7d7e3c8d93ac00b19ebf9d8ea53c (patch)
treefacbce82a048982f763eaa9dae2f6b51ef11bdad /libs/androidfw/ObbFile.cpp
parentfdf65f7a28079a46bde20044ec360bac4e54ae0b (diff)
parent0062109fe62f32fcb490d79222ec7dfbe84aa3dc (diff)
[automerger skipped] Merge "Check URI permissions for resumable media artwork" into udc-dev am: 80a36bf714 am: 0776a21aa7 -s ours am: 0062109fe6 -s ours
am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 470f62bc89 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24555974 Change-Id: I93c8a23c983f80ff4f061fa712429ca44a3b092d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions