am 2f19b0b5: (-s ours) am 7fbb4a91: (-s ours) am c84e354c: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '2f19b0b5c8137609c64733bc6d94662143664512':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-01-29 17:30:45 +00:00 committed by Android Git Automerger
commit 6e9b4af336

Diff Content Not Available