tree 187ccd4735f0e41b93e6c9d2414b60339d97475b
parent 166cf980afafb83add7479cfeb3a8e0283cfee81
parent f1270cfb846840c6e303ec0c2b4b0200506fd205
author Geoff Mendal <mendal@google.com> 1421440817 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1421440818 +0000

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