tree bbefb1193905b108348d89cbce504b1d8f21a89c
parent 72a204199510afdeb9cec483b4113433fe61089e
parent 56e814fdf7c555ecd3ab53d0bf9f34db6de75e47
author Geoff Mendal <mendal@google.com> 1417668891 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417668895 +0000

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