summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 23:13:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 23:13:24 +0000
commitc653a3ac1c38ecd2c08828c06d4206fb23087c22 (patch)
treec29f13fdde3d80369d840503e49d7834dc011d70 /libs/androidfw/ApkParsing.cpp
parent8a87822a21eaf7d35b11b8111349b5cfa9537a29 (diff)
parent4bea2c5f09e4f574476eb763af82977af90e522c (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-qpr-dev am: 0103e3149d -s ours am: f3e578fbc9 -s ours am: 6e5dd607dc -s ours am: 0f25ed8718 -s ours am: e7e81fffc6 -s ours am: c76d085fc3 -s ours am: 4bea2c5f09 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640916 Change-Id: Icd74e15e364b1f592609d25633461e4f2023dea2 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