Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2130b28754 -s ours
am: bcd2ea35c0 -s ours
* commit 'bcd2ea35c0d51ba0cb193078a546235ffd3b3e3d':
Import translations. DO NOT MERGE
Change-Id: I24dc4ae1290f9bd92b82793ebb394df6adab4a2a
This commit is contained in: