Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d2ecbf5cf6 -s ours
am: e897deae00 -s ours
* commit 'e897deae008d6ce751bc1b2f7b77a813f52eab65':
Import translations. DO NOT MERGE
Change-Id: I04e31d4a3f3994356c1ec40f127da57bc36a7a6c
This commit is contained in: