tree 1623537fcc2b92dee858ee12c4d9976a2436a5f6
parent a64a09042cd64d57e145c8c88693d929450a5878
parent 395cf2d1ce9ed817dae092b2fc33ad6f9bb881c4
author Baligh Uddin <baligh@google.com> 1404682461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682461 +0000

am 395cf2d1: (-s ours) am 12d64129: (-s ours) am c53e033e: (-s ours) Import translations. DO NOT MERGE

* commit '395cf2d1ce9ed817dae092b2fc33ad6f9bb881c4':
  Import translations. DO NOT MERGE