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