Merge "Import translations. DO NOT MERGE" into nyc-dev
am: fb9e8e3188
-s ours
* commit 'fb9e8e31884e26f09ac35ec81ab5fc8c518a0945':
Import translations. DO NOT MERGE
Change-Id: I7f7eda9e147f87c2c4c487addc2fbfe4b1ec1831
This commit is contained in: