tree d8d2a645079e7e380315ac3c207fbaa967c7340b
parent 8f1dc6917c774a9c6c3d3589a0c40f3b4a593a07
parent b54384cb1dea088b1a6a1e71113a09995ea11b1e
author Baligh Uddin <baligh@google.com> 1389073809 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389073809 +0000

am b54384cb: (-s ours) am c862dd19: (-s ours) am eba4fb66: (-s ours) am e0659df8: (-s ours) Import translations. DO NOT MERGE

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