summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 06:49:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 06:49:21 +0000
commit890b2422593ef4be604dea752c963a1d5ad7ff90 (patch)
treefd700ba10adda6e51773fa2508f0138d3d74c9a9 /libs/androidfw/FileStream.cpp
parent0e38b1e301686d786f2610b297544f499e725a2f (diff)
parentfd7fd433b134f29e2ab584f6e37a1fdf91ca469e (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b61b -s ours am: cdbede6443 -s ours am: ff6c98c175 -s ours am: ac22d32daa -s ours am: e2a0b727c8 -s ours am: f4feb1e9f8 -s ours am: 373c2479c5 -s ours am: fd7fd433b1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267 Change-Id: I8afe465ae02e5a04a048119c6b20e1cdec66a492 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