summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Nikita Ioffe <ioffe@google.com> 2022-11-25 19:16:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-25 19:16:34 +0000
commit135f60131a746b7273c69877540c24f79c25730b (patch)
tree12e2ab0b87f15ccebb8171256ff594d0be94a563 /libs/androidfw/AssetsProvider.cpp
parent071357b6c9f5ff0159faf5485cc4727d1c715aca (diff)
parent952b7718995b6637617513f953d95a9be45b390a (diff)
[automerger skipped] Merge "Register managers provided by the com.android.virt APEX" am: a8d89abdad am: aab7551889 am: 952b771899 -s ours
am skip reason: Merged-In I488c275343753f2a3af6270cbad2ab02f33f203f with SHA-1 167b913ad4 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2304136 Change-Id: Ie7aa2a763403f928a3daf0258c78704ae4f45044 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions