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