Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7b9f32be79 -s ours" into nyc-mr1-dev-plus-aosp
am: b8b4aba44f -s ours
* commit 'b8b4aba44f952aa79a52603749fcf51965df1044':
Import translations. DO NOT MERGE
Change-Id: I49b846c4fb947beef95cfcfe20ab7ef1be652233
This commit is contained in: