tree 0a15a94c7c4e2bfe07ae627de727ebb189ca3e5f
parent 8f57193998542a7648528f62e5c43b46d6f36ce3
parent 235e727edfd7cda8b5a9e580f521c7d564584dbd
author Baligh Uddin <baligh@google.com> 1404675218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404675218 +0000

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

* commit '235e727edfd7cda8b5a9e580f521c7d564584dbd':
  Import translations. DO NOT MERGE