tree f9eb3a48c6339f9cd744cd98fa184bb54a9244d6
parent be377b58d5c68c7dcdd15ee215cdb347499c73dd
parent e93eb58ef0ed89f3977802518c145f36c0894499
author Geoff Mendal <mendal@google.com> 1412634673 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412634673 +0000

am e93eb58e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'e93eb58ef0ed89f3977802518c145f36c0894499':
  Import translations. DO NOT MERGE