tree 1e95cb4b0b70723f78e7c8b75f5c707e2351a5d2
parent 7962e6910490286117c6b5a55550313dc7e5815c
parent a0361785e7e2719024352e4d7fcc270d976f20d6
author Baligh Uddin <baligh@google.com> 1386795761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386795761 +0000

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

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