Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6ee2d7e11 -s ours
am: d2308ffe10 -s ours
* commit 'd2308ffe10179ea6d00c538a24798922d7d40bb0':
Import translations. DO NOT MERGE
Change-Id: I799ecb9bc13d8369b3d14eef2949da6f54e3723f
This commit is contained in: