tree 30fe79067b88259b19808cdfbf5698b9a393f878
parent 7c8519fd8b861375c53caba582cd2c1dc7c83d46
parent 6e8dfbf240d8b2d6e6360065198b117d62879c26
author Baligh Uddin <baligh@google.com> 1386801744 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386801744 +0000

am e0dad508: (-s ours) am a2a415ba: (-s ours) am ac1afdc9: (-s ours) am 6a546a12: (-s ours) am 99425be2: (-s ours) Import translations. DO NOT MERGE

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