tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 50daf9503ce2582851b34cb63a44a761cfb533ff
parent f3804c181bb8ba988c417f365067df9dc416fdb2
author Baligh Uddin <baligh@google.com> 1392411664 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411664 +0000

am f3804c18: (-s ours) am 1b2ee8c1: (-s ours) am 286ecf1e: (-s ours) Import translations. DO NOT MERGE

* commit 'f3804c181bb8ba988c417f365067df9dc416fdb2':
  Import translations. DO NOT MERGE