tree 8ad1b340a6cf206802d4d1c97919c0ef518782e6
parent 65f120d9ed8bb80bbd9b7c971400e95861b6d8aa
parent 8ef7f717c59d95e2124dbeaf250fe76452085dfc
author Baligh Uddin <baligh@google.com> 1352529706 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352529706 -0800

am 8ef7f717: am 7774041f: Import translations. DO NOT MERGE

* commit '8ef7f717c59d95e2124dbeaf250fe76452085dfc':
  Import translations. DO NOT MERGE