tree ec8ba15f4ed918e21e7e03f4dd61d7b6c41f054d
parent eed3b17a99298b8a6d8e340cfb30fdd14d543931
parent c7b77ae764f0036f15e1ac9c5684f46b4ea4c89e
author Baligh Uddin <baligh@google.com> 1398220219 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398220219 +0000

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

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