tree cc106cf772232e5cdbe5fa58711532b62b3fd571
parent c3cc414cb613283b5324708c4919b899aec415d5
parent c78c452496bd346dce7fa65f13a402c641668321
author Baligh Uddin <baligh@google.com> 1408984360 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408984360 +0000

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

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