Merge "Import translations. DO NOT MERGE" into nyc-dev am: 71c4e0b44a -s ours am: 97d5e2fc44 -s ours
am: 264ffe11c8 -s ours
* commit '264ffe11c89f90fb9351817c62b040dcafdd3db8':
Import translations. DO NOT MERGE
Change-Id: I3a871c668aa31e603d13c3a34b476be07e30c5ef
This commit is contained in: