am 867f2d49: (-s ours) am 9a3a3db1: (-s ours) am 79d81b58: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '867f2d494ab104e834538aff78956d881b8bfaf0':
main
Baligh Uddin 2014-10-28 07:22:53 +00:00 committed by Android Git Automerger
commit 76b5562d78

Diff Content Not Available