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

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

* commit '13db18325d7f10f08df5e54759389a8e023fb2f0':
  Import translations. DO NOT MERGE