tree 0771dc23b469606b7140108091973ffa65b6d1c0
parent 2204dc6b63b9e0c681c7280364263dfcbcb3a7bf
parent cc95d18d6ddeaf247b1f43659153edb1b3f315d7
author Baligh Uddin <baligh@google.com> 1396469541 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396469541 +0000

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

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