summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 02:00:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 02:00:01 +0000
commit1faf21d01be67f93cb56ee780253231445000f12 (patch)
tree5f51963a0c4f75454344fe01b43e5b830dc9e29f /libs/androidfw/AssetManager.cpp
parentac335d79899285e3229200ffdec954161c2da874 (diff)
parentcae054df50b3b8ff046ed75c4fe9bfaef6829ac7 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-qpr1-dev am: da4914d600 -s ours am: 87340e33c9 -s ours am: 093de6a977 -s ours am: 3902f5d181 -s ours am: cae054df50 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640912 Change-Id: Ia885f6b6f7c495f7868ca81515eef88e99cea67f 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