Merge "Import translations. DO NOT MERGE am: cd669b648a -s ours am: 5cb9547cb7 -s ours" into nyc-mr1-dev-plus-aosp
am: 74414f2444 -s ours
* commit '74414f2444131a1cb5130f789566779e32710382':
Change-Id: I22dd078d8c84c5b0ba89432b5a6011a635a23138
This commit is contained in: