summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-06-10 06:51:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-10 06:51:06 +0000
commitfa5545e967dd30066e7f44b9be7d24825467f25b (patch)
tree898350ae9d25caac22db21bb62cb2a76a6242179 /libs/androidfw/AssetsProvider.cpp
parentc8fdfede545290fedda6dd34cd4def186d172c6a (diff)
parentd8e20e698bfa9fa08c3ab86d969ab3de836c94df (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d8e20e698b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18817323 Change-Id: I9e70ec1e14b801ab2307ee7bc490b1150876ed2e 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