am d8e1221d: (-s ours) am a041ad47: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Sep 2013 04:59:32 +0000 (21:59 -0700)]
* commit 'd8e1221d167b2086f71b807332ea558efe83d867':
  Import translations. DO NOT MERGE


Trivial merge