Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 561ae1baca -s ours
am: 0acacda9a9 -s ours
* commit '0acacda9a9d4028686ad739f6c8ff4b4a8a2bc34':
Import translations. DO NOT MERGE
Change-Id: Id599aec7dff8238adc2400d5f488a265698d0ff5
This commit is contained in: