diff options
| author | 2023-10-05 17:44:11 +0000 | |
|---|---|---|
| committer | 2023-10-05 17:44:11 +0000 | |
| commit | 2e42573107feee54fdbe6b9a7c446feee32f7a56 (patch) | |
| tree | 9430efd7b7df317366c6399d6587cdcc5d4b0b3c /libs/androidfw/ObbFile.cpp | |
| parent | d79cd23fb6bd2f6ffb7b1bdd4197b9fded5cfa8d (diff) | |
| parent | 82c1548df34a656ff01cc22ea57d6f74a8372bde (diff) | |
Merge "[automerger skipped] Merge "Check URI permissions for resumable media artwork" into udc-dev am: 80a36bf714 am: 0776a21aa7 -s ours am: 0062109fe6 -s ours" into udc-qpr-dev-plus-aosp am: 82c1548df3 -s ours
am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 c8b7d562cf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24555974
Change-Id: Ia197b24f6700beed7e3ae6cf75a953928ccad8cb
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