tree a35a5cb57ebcb4a6e7bbbfe3f21d813e6be70f4a
parent 26e89553489b962ad587c80ca326829a596b6ea6
parent a37450f044dee6b6f7c5568cc815a988de4e90fc
author Baligh Uddin <baligh@google.com> 1412532302 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412532302 +0000

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

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