Merge "Import translations. DO NOT MERGE" into nyc-dev am: 645c198 -s ours
am: 987b621 -s ours
* commit '987b6211574463a3ed139373dd3e1b241dae64d5':
Import translations. DO NOT MERGE
Change-Id: I6353e86f3630d5c063eb02adaf1dde58b744603b
This commit is contained in: