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

am bb69c0d8: (-s ours) am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE

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