am b622767c: (-s ours) am 460f7664: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:18:23 +0000 (14:18 -0700)]
* commit 'b622767c325b0b90163738aba2e83c125a1b4189':
  Import translations. DO NOT MERGE


Trivial merge