am c0498333: (-s ours) am 4e4ef211: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 17 Oct 2013 15:37:04 +0000 (08:37 -0700)]
* commit 'c0498333d7a836f24ea72934e9d8d118a273b324':
  Import translations. DO NOT MERGE


Trivial merge