tree 1f6064a82a72e57e886f52b2067b3ed07681873d
parent 6a3faf5a8b182d20dea47fb76cf33456321ddf7a
parent c6da9afdcc2a24f8c5a0e7c29541ea6b978f2bae
author Geoff Mendal <mendal@google.com> 1412638098 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412638103 +0000

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