Merge "Import translations. DO NOT MERGE" into nyc-dev am: 24708d9c8e -s ours
am: 5165a87256 -s ours
* commit '5165a87256f757bc28f360b185c718ec30f716d4':
Import translations. DO NOT MERGE
Change-Id: I506282d4d986fcec89a8ff1ee9d7e01d45a9fb67
This commit is contained in: