summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 04:00:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 04:00:36 +0000
commit11a8d732180deaca0915793c29517b122bcbfa1c (patch)
tree1b6db7bea9625a8cf9a92ad82e8747786c69ffbd /libs/androidfw/FileStream.cpp
parent7dc906447dcaacb8eff1e05cc205b952d8fec96f (diff)
parent7b12a982c3cb593a52ef3f617a3680d88dc40a34 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-qpr1-dev am: da4914d600 -s ours am: 87340e33c9 -s ours am: 093de6a977 -s ours am: 74e720fe3d -s ours am: 417e556ba0 -s ours am: a9dff7e75a -s ours am: 49ed7af003 -s ours am: 7b12a982c3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640912 Change-Id: I087d6e9af5bebe87446d49de823e19c6f4c3530c 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