tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 91547b4cc0d7f490083709b91931cf8f52477eef
parent 16e56d7511ddfc797b2233494654858d6ae5421d
author Baligh Uddin <baligh@google.com> 1392411666 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411666 +0000

am 16e56d75: (-s ours) am 588975f0: (-s ours) am 8eb857fa: (-s ours) am 458a15f7: (-s ours) am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE

* commit '16e56d7511ddfc797b2233494654858d6ae5421d':
  Import translations. DO NOT MERGE