tree 0b9f9ede59440f2f414ff826b8852d504f098a12
parent e95ca561c515f927caae4b4de27aa73cad789b07
parent d9d0f513b20f9838befb8f96fe33f7a25d68de53
author Baligh Uddin <baligh@google.com> 1404682529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682529 +0000

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

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