tree 18b37453c842f59254edbd4a0f7102e3cb195ab1
parent e12642b8d4b0a38b3ab2ec76618aa2c8aebe2bc2
parent 9de1b38d32c9f367de8dad3d2e778de8b62c3b68
author Baligh Uddin <baligh@google.com> 1350537591 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350537591 -0700

am 9de1b38d: (-s ours) am 9dba9311: Import translations. DO NOT MERGE

* commit '9de1b38d32c9f367de8dad3d2e778de8b62c3b68':
  Import translations. DO NOT MERGE