summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 06:47:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 06:47:48 +0000
commit297561bfab86c84e6ee8f3c7e1c08f02aeec215f (patch)
treea6bcaff6d4249c5fbcf70dc8f5c120d101466467 /libs/androidfw/FileStream.cpp
parente42863860331187f9a3a7175554239453efda831 (diff)
parente6fba67d6ddfd18e527197878c954d84a8d15ee5 (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: e6fba67d6d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267 Change-Id: Ie3e7d2a23e40812f4b38ab0b2c59626b4e21100a 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