tree 250b23c70bdf9f08242e163b37299e0953cba342
parent ef0a7e8fdbf60d6e5cc5f274f94516c3077895e5
parent 3c8b334d02e62d68522e47a118d4ee4fc8f23c48
author Geoff Mendal <mendal@google.com> 1414599585 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414599587 +0000

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