Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours
am: c29b39b95f -s ours
* commit 'c29b39b95f545e4c585d67fed17e3c59f3ef901a':
Import translations. DO NOT MERGE
Change-Id: I7ada5df98e9d67b7991e73000c5c8cc885a8ff71
This commit is contained in: