tree 70f8bccc2e82531451b715038296b8aa553c75d1
parent f0bea657e9bc4abd0eee401d981cc4d339b41c1b
parent 441874b19d79db51ea3488983f13b6e11b0cf796
author Baligh Uddin <baligh@google.com> 1394729279 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1394729279 -0700

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

* commit '441874b19d79db51ea3488983f13b6e11b0cf796':
  Import translations. DO NOT MERGE