tree ebf3143a3d842c584b9df1d99bcb826c35123545
parent 8b7de609514b93ae196fb893bb9cd7daf0202a10
parent 0291f565ef0fcc21c49de5bce23dd603626e0233
author Baligh Uddin <baligh@google.com> 1386866432 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386866432 -0800

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

* commit '0291f565ef0fcc21c49de5bce23dd603626e0233':
  Import translations. DO NOT MERGE