tree 69a45961f1d0bec484fc136132130ba9d594db18
parent 91ee5e7f14ac3ca016753e3bf0b50f187fcb5b69
parent d136fd84d47915fad33511cbab72f0c3fcc01136
author Baligh Uddin <baligh@google.com> 1410881528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410881528 +0000

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

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