tree 736601b9726173f92866c9f04511063b28475eeb
parent b2ff37fa78e748d7e2e32ffd9ef706ec8ed72de0
parent 20326a3263b8bd71ea98d5ea88e53cf0f6715d33
author Baligh Uddin <baligh@google.com> 1412023551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023551 +0000

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

* commit '20326a3263b8bd71ea98d5ea88e53cf0f6715d33':
  Import translations. DO NOT MERGE