summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-07-20 16:59:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-20 16:59:40 +0000
commitbc2b1abb12dda2be4c607836770a7a6dd685ba37 (patch)
treef1e8636f62f93006dbd6c8d326486e4f2c222790 /libs/androidfw/AssetsProvider.cpp
parent8cf5c33365b0d8c8d7a8104d7759596429e28521 (diff)
parentc640fa8727095520dc412f80d4ddd3c400a293ef (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4b03a0ed58 -s ours am: e7cc777e99 -s ours am: c640fa8727 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347602 Change-Id: I844337ffcbcef2fb267e976e04ac47ccf1a50f51 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