tree 0797b187cb568d022809b368d1c93d0105995da4
parent 8f6e35b2856a6dc43db294397304dd27d72982af
parent 4142f70c5836f0b2830a3d22a02cc6781084bd5b
author Baligh Uddin <baligh@google.com> 1354636541 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354636541 -0800

am 4142f70c: (-s ours) am 56a6fad3: am 7abcd22d: Import translations. DO NOT MERGE

* commit '4142f70c5836f0b2830a3d22a02cc6781084bd5b':
  Import translations. DO NOT MERGE