Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours am: a882b8c150 -s ours" into nyc-mr1-dev-plus-aosp
am: fa764c3fa3 -s ours
* commit 'fa764c3fa3959ca94766b0a7ed406aab410f772a':
Import translations. DO NOT MERGE
Change-Id: If98ee299365005e4ccf892062ba1028ec62e261a
This commit is contained in: