Merge "Import translations. DO NOT MERGE" into nyc-dev am: 71c4e0b44a -s ours
am: 20f307f56c -s ours
* commit '20f307f56c380ae6f7c6235d77249a26cd0e0f05':
Import translations. DO NOT MERGE
Change-Id: I67668e74325307764d1efd3ae3bb3cfd7bf18a95
This commit is contained in: