summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-06-06 21:34:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-06 21:34:24 +0000
commit3b822e2821113635da2e431207f182f907209857 (patch)
tree50549eb42960fb86f8af961d673e291d87d3c11b /libs/androidfw/AssetsProvider.cpp
parent658a6aa39ddbaf1c527ef2c9aa66b2323cb2661a (diff)
parent144e52f561721f679df6fbdd0e22bc85de6f0b35 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 69f0caa052 -s ours am: 144e52f561 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18747067 Change-Id: I0458c4c2b922e40261ea490523a223cb77c76ddd 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