[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a88f8c4e1a -s ours am: a28f44d479 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513126 Change-Id: I5750e7c4f9732d3dd85183a7093252d5271a2ec1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: