tree dbab1b11f822afd53385097c3d5b38464a9fc88c
parent bc0a40647bedd5f80512dc553b8e3bdab1ccb705
parent 839ab5f2596444fb0a2b1b1f23a7b2598ba90ba7
author Baligh Uddin <baligh@google.com> 1398350472 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398350472 +0000

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

* commit '839ab5f2596444fb0a2b1b1f23a7b2598ba90ba7':
  Import translations. DO NOT MERGE