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