summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Michael Mikhail <michaelmikhil@google.com> 2023-05-26 23:49:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-26 23:49:08 +0000
commit93ea27ee4c6210a33b63d05343ec83ca38ba11e2 (patch)
tree0c494baf4ae214e5c738cb955c42f713dbcc8055 /libs/androidfw/FileStream.cpp
parent05430e1d096744329df72076d9cb765d9ce7764d (diff)
parent8fc9be922b8becfa301281110b1808607554ee2a (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: 445b144320 -s ours am: 8fc9be922b -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: I13b5ab50ada20b9db31df78f88d388ecb21a8343 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