tree db35656d6647ad8866ef058d32a8b681a4c07d6b
parent 4e487050dbad6bd52386507df976b34976931663
parent 38e5f9b4c5d9dc4d2421ef569988e0f960d3e1a0
author Baligh Uddin <baligh@google.com> 1410890571 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410890571 +0000

am 38e5f9b4: (-s ours) am f242aee4: (-s ours) Import translations. DO NOT MERGE

* commit '38e5f9b4c5d9dc4d2421ef569988e0f960d3e1a0':
  Import translations. DO NOT MERGE