tree 9d9e5bc445cbf3999397f7f8a1528458ec2f3380
parent 5acaec6d6e88f303905611fe2c5e56811fe84d83
parent 219d531a98d555ba25eebfa8836114fdb73fd51e
author Baligh Uddin <baligh@google.com> 1413734146 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413734146 +0000

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

* commit '219d531a98d555ba25eebfa8836114fdb73fd51e':
  Import translations. DO NOT MERGE