Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 23b665d65c -s ours am: 8525e50530 -s ours" into nyc-mr1-dev-plus-aosp
am: f381dad9fc -s ours
* commit 'f381dad9fc221adb00d5a93ef02c5b557da44712':
Import translations. DO NOT MERGE
Change-Id: I860169f4c61856303448ab00478b6de78188f90f
This commit is contained in: