Merge "Import translations. DO NOT MERGE" into nyc-dev am: 072150db89 -s ours
am: 725ce2bc3f -s ours
* commit '725ce2bc3fcda86c08725e5cb3696e1a5adbc179':
Change-Id: I964c896985a493ac3cd2c2829ab406514b63424e
This commit is contained in: