tree 7c206fb35049fb5be574c5058524033d673b9ff8
parent cf9a92a79fca5d6226e37d76e2f1c23238c072af
parent 31920daec9d919c83f88e12002914fcef48882da
author Baligh Uddin <baligh@google.com> 1367882450 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367882450 -0700

am 31920dae: (-s ours) am f6f93cfe: Import translations. DO NOT MERGE

* commit '31920daec9d919c83f88e12002914fcef48882da':
  Import translations. DO NOT MERGE