summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 02:01:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 02:01:04 +0000
commit49ed7af003fac28ce55232a164d6b56434c94ac5 (patch)
tree5f51963a0c4f75454344fe01b43e5b830dc9e29f /libs/androidfw/FileStream.cpp
parent9149d772fd20b2df1a838c24c4e41ee178398a06 (diff)
parenta9dff7e75ae8ca9f50757860e01510d6fc1f10db (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640912 Change-Id: Ie6417968b4f876ebcfc185e82b5b6f5141529df1 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