am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '22f10ac4016c6879f55d65b16765440ff9453f58':
main
Geoff Mendal 2015-03-26 21:09:12 +00:00 committed by Android Git Automerger
commit b5cac10334

Diff Content Not Available