am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e':
main
Geoff Mendal 2015-03-26 21:09:10 +00:00 committed by Android Git Automerger
commit 01072c69f1

Diff Content Not Available