am be4af750: (-s ours) am 813f6d80: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'be4af750bcbb3046a55a466e1beeb40d024e193c':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-01-29 17:21:50 +00:00 committed by Android Git Automerger
commit 54e4e10668

Diff Content Not Available