summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Michael Mikhail <michaelmikhil@google.com> 2023-05-31 21:29:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-31 21:29:20 +0000
commit2522eb252718cbe570bf3d16765125f0209df795 (patch)
tree80b251b00e23aae640fc8541ca0db0a3dc9c1ea0 /libs/androidfw/ObbFile.cpp
parent8db409c23e8cbeed57df9fd4e74902fe8354423a (diff)
parent36bf22cf4995bc09754b740e085f4331f01415da (diff)
[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into rvc-dev am: 02a632ff37 am: a2212c18cb -s ours am: b145277797 -s ours am: 52e794eeee -s ours am: 77e4746cd9 -s ours am: 36bf22cf49 -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 b8a7fd8e6f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23174295 Change-Id: I806ae338c095b8c64e2c178171792762b4124bde 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