tree d628ec80c23175f77933b0d329f2f767538a736a
parent d048f87a25386d46afb250a91a9da5fa4bc35fc0
parent 0878fbf7324a8980ff35c6fc0a871c0d2f8447fb
author Geoff Mendal <mendal@google.com> 1433042320 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433042322 +0000

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