Merge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46 -s ours
am: ad145e5 -s ours
* commit 'ad145e503eee7aba6d61923b39b39c343021a737':
Import translations. DO NOT MERGE
Change-Id: I3a93748beebe7a50dbe3c1b19b2bf0c9b58af54d
This commit is contained in: