tree 10da860fcff71886af91d082e31f0e1917926848
parent 97cc8b1173df01b02b8b9d3bebc038a78089e4ed
parent 9be2b331a96321047d70072d79920706c5f835ae
author Baligh Uddin <baligh@google.com> 1414566071 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566071 +0000

am 9be2b331: (-s ours) am 8cd3b4b3: (-s ours) am c1ed7f3b: (-s ours) am 322554a0: (-s ours) Import translations. DO NOT MERGE

* commit '9be2b331a96321047d70072d79920706c5f835ae':
  Import translations. DO NOT MERGE