tree 767ccefe07c6037f86911d1e7f029323fd443879
parent 8ab775e5660b716081f1edd267dad2459f204150
parent e016c046abb50bb8d4c0b406c1fc14cfeb6a6ee3
author Geoff Mendal <mendal@google.com> 1412628707 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412628708 +0000

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