am 137cc5d3: (-s ours) am b48a6519: (-s ours) am fa18dac7: (-s ours) am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '137cc5d34e147339948f60f52564679be32a99db':
main
Geoff Mendal 2015-03-26 21:24:08 +00:00 committed by Android Git Automerger
commit 1434aeba6e

Diff Content Not Available