tree 7f7e31c000c122338b27efc695fe71f5b3cd454c
parent c61cccaf61bf3cc1920d3d0d33cca598af99f0d7
parent b513f30a1f2a705e547dec7dfe958102ccf19d93
author Baligh Uddin <baligh@google.com> 1403552491 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403552491 +0000

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

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