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