Merge "Import translations. DO NOT MERGE" into nyc-dev am: 94942bb070 -s ours
am: c92dca01ec -s ours
* commit 'c92dca01ec873e57b8d602468ce664d6bdcdfae6':
Import translations. DO NOT MERGE
Change-Id: I2914bf02a02902861b2c44666b1f8680e415919a
This commit is contained in: