Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 917ead578b -s ours am: 713a057fb6 -s ours" into nyc-mr1-dev-plus-aosp
am: bcd5e6d24f -s ours
* commit 'bcd5e6d24fa2b983417f7a6d73db184ba736facc':
Import translations. DO NOT MERGE
Change-Id: I9023b919928eedd5fc8fc85dd4673ae1a769f439
This commit is contained in: