Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

This commit is contained in:
Geoff Mendal
2015-02-12 23:00:57 +00:00
committed by Android (Google) Code Review