summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 22:03:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 22:03:55 +0000
commit5c0c99ddde6d5b55be01c2805670e7521ff4171f (patch)
tree29137ae55c7003caf800fc740d595143e0ee418c /libs/androidfw/FileStream.cpp
parent122e4ea6d1cacea066d9e170da4ece41fbae430b (diff)
parentcb3ec8f5e3e5cee7ef35d1ef37f55000756f16da (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6ec -s ours am: e4b9774b38 -s ours am: 8c7af994ed -s ours am: 76f4b35269 -s ours am: cb3ec8f5e3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: Ic7c8425c5bab2f1f7aa482a373e20806b5dde048 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