Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ac773c8f7 -s ours
am: c0ec896186 -s ours
* commit 'c0ec8961863354cf60a307558d3ce4aff5f4c440':
Import translations. DO NOT MERGE
Change-Id: I50d2a935ff251eb11335c9a7c04c32cf93c7c6d6
This commit is contained in: