summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-07 01:30:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-07 01:30:51 +0000
commit459e0fbeb5c63f2076269ae88ce370e723e1cefc (patch)
tree46932fdaa2ae3a1d0b662b5562114f0cccd611a0 /libs/androidfw/ApkParsing.cpp
parent1faf9bc97da1047259dcc5b61e3412e0bbb4123b (diff)
parent73f12505fc060ca0b185357d7621c662e6995272 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-dev am: e48d7291ca -s ours am: 2d941b0818 -s ours am: 99ae21062a -s ours am: b9ab54d757 -s ours am: 4dd7b2cfb9 -s ours am: 1cb821baf5 -s ours am: 73f12505fc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640919 Change-Id: Ia2e9dee097ef047f062c1675f8170c061cc925ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions