Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed
-s ours
am: 1f055cb81d
-s ours
* commit '1f055cb81d40e4c2460c4421a44e1c9251a1313c':
Import translations. DO NOT MERGE
Change-Id: I7010a07cedd23ac9ae5f2bcebab8b6b20e60803e
This commit is contained in: