tree e4fb6f549a1d574a3400c0e70200927297c92778
parent cf9aebf138a3ec07277b1e5564751d2396a155c0
parent 2d81f9a2f97cf48ed3253186f558f4096cefcb6b
author Geoff Mendal <mendal@google.com> 1436801829 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436801832 +0000

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