tree d480a9df18213d791f716ded764bcd22e74dbd2d
parent a44fb323dc6e66823e216c66d4f622ea80f24a18
parent fe641ddf00d94602e6ff590c14f6ff35d45d2872
author Baligh Uddin <baligh@google.com> 1408142499 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408142499 +0000

am fe641ddf: (-s ours) Import translations. DO NOT MERGE

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