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