summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 00:06:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 00:06:19 +0000
commite4a8444b1d0abb0ac8e6fcb1453fbeeec342ecb2 (patch)
treeff20c292692c5d693827894e73de1f753fa9c230 /libs/androidfw/AssetManager.cpp
parent5551fe8a1bea6b6bc05be3585d081d5602a7e0a4 (diff)
parente4a2745266f8c32ea8df1c203eec91bda7e7e679 (diff)
[automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-qpr-dev am: e4a1d8f87f -s ours am: e4a2745266 -s ours
am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 c13567e39c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24550945 Change-Id: Ia3a00fd5fab46382ce5145de41c5f260afa1a6f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions