tree a1fea658839598021eed89bce5fb0ed3b0a36078
parent 97892901cd8d86a2c9075be6ad12fed62b4df523
parent 7892a496152d811c29d817426a8796ad9cc27473
author Baligh Uddin <baligh@google.com> 1402144428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402144428 +0000

am 0b8dd221: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev

* commit '0b8dd221d213d876438d65d67641001f51cd494d':
  Import translations. DO NOT MERGE