tree 98fc8c9e9cbe1710b313eb29572ee7f25fea2f89
parent 812975599d8e33eb93addaa04e802854f38d3ff0
parent 59d1c9072283159dfa02b829ec843acded784aa5
author Baligh Uddin <baligh@google.com> 1412624402 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412624402 +0000

am 59d1c907: (-s ours) am 98cbf13a: (-s ours) am b3ee8610: (-s ours) Import translations. DO NOT MERGE

* commit '59d1c9072283159dfa02b829ec843acded784aa5':
  Import translations. DO NOT MERGE