tree f9eb3a48c6339f9cd744cd98fa184bb54a9244d6
parent cc905070716384be515de6f8410612ecb4495a4a
parent 35a990a08f134dfe450a80cb3c7e2f69334467bc
author Geoff Mendal <mendal@google.com> 1412628770 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412628771 +0000

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