am d33f7d6a: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'd33f7d6a6201edb0f15f25511c9c3323b67a295a':
This commit is contained in:
Geoff Mendal
2014-10-27 18:53:11 +00:00
committed by Android Git Automerger

Diff Content Not Available