Merge "Import translations. DO NOT MERGE" into nyc-dev am: 71c4e0b44a -s ours
am: 97d5e2fc44 -s ours
* commit '97d5e2fc448c78dba0d36b71f573c0c9559f4b97':
Import translations. DO NOT MERGE
Change-Id: I07e6d812002ec40d7ed7d76918d70e62403e115b
This commit is contained in: