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

* commit '585f624ba50bc34eb2661bf2f6d3e266d1a55acf':
main
Geoff Mendal 2015-03-26 21:00:35 +00:00 committed by Android Git Automerger
commit 7424f8c587

Diff Content Not Available