tree 3839c4df6e46ad8490e6c0ed5cb7f0b46c67498d
parent cbe3a70c2df781fc32897d3475c4035ce2b9726d
parent 299cf6da2ecf2177f01985e283cdd78a1c05d4d0
author Baligh Uddin <baligh@google.com> 1365624419 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365624419 -0700

am 299cf6da: am 813a757b: Import translations. DO NOT MERGE

* commit '299cf6da2ecf2177f01985e283cdd78a1c05d4d0':
  Import translations. DO NOT MERGE