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