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