Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours am: e145cca1d0 -s ours
am: c6da591a08 -s ours
* commit 'c6da591a0854d0f5e725bd531ffac2b349c518d2':
Import translations. DO NOT MERGE
Change-Id: I81f5cfada627d2a1440d504820bca3b2fcdac874
This commit is contained in: