Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7533f3260e -s ours am: 9283938bc7 -s ours" into nyc-mr1-dev-plus-aosp
am: aba7e13c03 -s ours
* commit 'aba7e13c03bbdff5213c1f162becf9f65b9aac8f':
Import translations. DO NOT MERGE
Change-Id: If3f8a2d6198e1efa9e4cce6e2915f339b48959c0
This commit is contained in: