summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Michael Mikhail <michaelmikhil@google.com> 2023-05-31 22:13:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-31 22:13:54 +0000
commit9070ba06de6008f670f90dced3e24c13aa825066 (patch)
tree0c1c43c97334c40b9c1002603f406d5eb0ffc143 /libs/androidfw/FileStream.cpp
parentfd8473b9031fe25528b1de2e0d55932eddd3d82b (diff)
parent11a1c59757f4401bd8be547f8ab90510a90141ab (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: 2522eb2527 -s ours am: 11a1c59757 -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: I4766fda1279ca23c9abd79aa2482a4ce0aa4fef8 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