Merge "Import translations. DO NOT MERGE" into nyc-dev am: 57ab609aab -s ours
am: e7de9ec52d -s ours
* commit 'e7de9ec52d69066c871652818ac13dab737d7d64':
Import translations. DO NOT MERGE
This commit is contained in: