tree 27ff773a90b91a014077a4f088ceab9f86e785e8
parent 95e89caeb252a54807c76d60c7440766829e418c
parent 92ed2ec0157352464afc293c6359298c94834766
author Geoff Mendal <mendal@google.com> 1417012363 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417012365 +0000

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