summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Michael Mikhail <michaelmikhil@google.com> 2023-05-26 23:25:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-26 23:25:16 +0000
commit445b144320f073a24a864eef5c019459b3899597 (patch)
tree1d028f3cba7263f651b3541dff9cebce3ec9d490 /libs/androidfw/ObbFile.cpp
parent82a3a98a99bdf97d13ef6d0f54c2df82c933a591 (diff)
parent52a864b8f76e96efdffa6cc9f664cb95f03480e9 (diff)
[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into sc-dev am: 2a93c53d21 am: 18a0a0920f am: db86e3e4cd -s ours am: 9a0b3244a2 -s ours am: 9b774827b4 -s ours am: 52a864b8f7 -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 01f65561df is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23207574 Change-Id: I6200cd579e2c2b363fdd407e5bac43ec2c00c558 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