am 27e50608: (-s ours) am 1f55a53d: (-s ours) am 4802efe1: (-s ours) Import translati...
Baligh Uddin [Mon, 27 Oct 2014 20:33:24 +0000 (20:33 +0000)]
* commit '27e5060875c5c7f7daa16d38383227dcc957d7f6':


Trivial merge