Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7533f3260e -s ours
am: 9283938bc7 -s ours
* commit '9283938bc7b05fab54f01e5d53d72021bb80101f':
Import translations. DO NOT MERGE
Change-Id: I91d54cae5b79c3ff45d0abd91ba058b376c0b68f
This commit is contained in: