Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6d160e9b8d -s ours
am: 5424a1be12 -s ours
* commit '5424a1be12c13087e4ceffd39d66254e06c2436e':
Import translations. DO NOT MERGE
Change-Id: Idfcd9e4d516ac5fb7a6ed2491eb1548da0b0fefa
This commit is contained in: