am 75a05460: (-s ours) am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '75a054602c2770fa66d85d22466f20ca2cdf7694':
main
Geoff Mendal 2015-03-26 21:09:18 +00:00 committed by Android Git Automerger
commit ec71a21787

Diff Content Not Available