summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 22:05:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 22:05:11 +0000
commit8d7b2ac0a5a64cf1acbb1eb5b07f3cd8c7278609 (patch)
tree29137ae55c7003caf800fc740d595143e0ee418c /libs/androidfw/ObbFile.cpp
parentbb316ccfc4238a2b2ae2a16a5e250cfae0d417d6 (diff)
parentc14bfd33f7247fa5a59abe064c19fe3b9758b6d8 (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: 20b0a7c3ee -s ours am: 1191771679 -s ours am: 42bd09244e -s ours am: c14bfd33f7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: I0efeb6b2df167eb895e398cac043c761b43f28d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions