Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours am: c29b39b95f -s ours" into nyc-mr1-dev-plus-aosp
am: 95d6b19545 -s ours
* commit '95d6b195451419e24f190ee0d3286eed84ab227b':
Import translations. DO NOT MERGE
Change-Id: Icd0e559f3e6bf7b17c44e5e04523d27eb72449e7
This commit is contained in: