tree 9b9d16dfaded74da356597889544b8575cea3307
parent ddaac40dc8f034c6d1f44fb95f3d710c44a97b39
parent c1ac011a00d0c269fed833ecb9b6e82dcc495b5a
author Baligh Uddin <baligh@google.com> 1404682570 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682570 +0000

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

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