tree 2d4ff6c5c3e23fb7dae3a5f658f12551c0ac1b87
parent 9680ed1a525cc5c98e57bf78e0a312d43ef38ae7
parent 70de475cc106b8645601a2961b77bcfb0616ac5e
author Baligh Uddin <baligh@google.com> 1443538186 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443538186 +0000

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

* commit '70de475cc106b8645601a2961b77bcfb0616ac5e':
  Import translations. DO NOT MERGE