tree 5517a83aeb3fc0beddfae53517dc46d96a113854
parent 901b8c98ecba095d53b8cc811a2c8c00ab0faad7
parent b5d18ea3c3b2a14b1de673a5f44065446ae5199b
author Baligh Uddin <baligh@google.com> 1383316165 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383316165 -0700

am b5d18ea3: (-s ours) am 6bc6b227: (-s ours) Import translations. DO NOT MERGE

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