tree e9a03184c58372d675772990658ff47af427e366
parent dcf40a9cc562d95f826123d8d670262c8d15e7bd
parent 9ef689ae9e1f102c9108a76ebdb45d553e76774f
author Geoff Mendal <mendal@google.com> 1418243901 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418243901 +0000

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