summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 01:35:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 01:35:06 +0000
commit813eb1e1e6fb6f35c166df959dc94d8fb8e2fa57 (patch)
tree1b6db7bea9625a8cf9a92ad82e8747786c69ffbd /libs/androidfw/FileStream.cpp
parent661eba6bc2d36a0e2a5bb0c3180be23c8ea0b128 (diff)
parentf0d484ce3ee2e106be3c09da3ecc1ceca1748058 (diff)
[automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-qpr-dev am: e4a1d8f87f -s ours am: e4a2745266 -s ours am: 8b4f13192e -s ours am: f0d484ce3e -s ours
am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 c13567e39c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24550945 Change-Id: Ie237b34613d9424fcc391928a39986dacace81f1 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