summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Nikita Ioffe <ioffe@google.com> 2022-11-16 09:40:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-16 09:40:21 +0000
commit9d5013bdcd7264361d9f3524b3ab2ac86a22d61e (patch)
tree558430b8c3848406b3b6718556803d6189f70128 /libs/androidfw/AssetsProvider.cpp
parent857add4f0a724397e89c10ed0cbb6415cd3d5cbb (diff)
parent5639ef4953591742fab670d72c1ed0ee88ee203b (diff)
Merge changes from topics "avf-sys-feature", "move-avf-jar-to-bcp" am: 757c168f12 am: 5639ef4953
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2259705 Change-Id: I0ec4b4f91dd746a96f4600e3f598f333ba879e59 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