Merge "Import translations. DO NOT MERGE" into nyc-dev am: eb50d20 -s ours
am: eeee531 -s ours
* commit 'eeee5312a22a261ecbcf4d20aae6ffa51acb4978':
Import translations. DO NOT MERGE
Change-Id: I671ac6baff8902125fa57d3f8344be132a015eb0
This commit is contained in: