am f89882e4: (-s ours) am 7a518a30: (-s ours) am 09128d0a: (-s ours) Import translati...
Baligh Uddin [Wed, 29 Oct 2014 07:00:57 +0000 (07:00 +0000)]
* commit 'f89882e431314ac3fa3b1f786c8c394631faec25':


Trivial merge