tree 87f388a442a7f477d7d79a59390decfaaa38a0bd
parent 04dcba49167c2877bd8093507132dba99d43b67e
parent 7b08f96e4d8fdd4f48c77b024ee23c66b72b1019
author Baligh Uddin <baligh@google.com> 1412095698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095698 +0000

am 7b08f96e: (-s ours) am b8d55913: (-s ours) am 3a9c1a0f: (-s ours) Import translations. DO NOT MERGE

* commit '7b08f96e4d8fdd4f48c77b024ee23c66b72b1019':
  Import translations. DO NOT MERGE