Merge "Import translations. DO NOT MERGE" into nyc-dev am: 83378cb136 -s ours
am: c6bc849b33 -s ours
* commit 'c6bc849b33fb9777636ad931c71cd27338298799':
Import translations. DO NOT MERGE
Change-Id: I4f446ef8565ebaa75b8a1fabcacc3cf993aa7f83
This commit is contained in: