summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Miguel Aranda <miguelaranda@google.com> 2023-05-26 17:47:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-26 17:47:34 +0000
commit862148d64a3e73b1c8c4b0a2e1621821a7d63d8c (patch)
treeac1111e188ba3d8ef8ef5fca10a04886295af43d /libs/androidfw/FileStream.cpp
parentdef71722859809f59a37e7f16e83728033f54b2b (diff)
parent3b2782ac96ad2fabcaea2e5e23e501b8b9faf2bd (diff)
[automerger skipped] Merge "Revert "Verify URI permissions in MediaMetadata"" into tm-dev am: 3f7b95fcfd am: c3247ddf9d -s ours am: 5a66955fd9 -s ours am: 3b2782ac96 -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad255f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23451199 Change-Id: If41b65ba179efe002a42a890c98d530d3275fa86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions