tree 6818cd04d17694ccf1b90f5897e6624b20e3ecdd
parent 8d1865e668b605dac9e6e07a4f4495480c816687
parent 5f524cb8affffd801d80f1f8b835f03adcd24a0b
author Baligh Uddin <baligh@google.com> 1362550388 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362550388 +0000

am 5f524cb8: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9

* commit '5f524cb8affffd801d80f1f8b835f03adcd24a0b':
  Import translations. DO NOT MERGE