tree 1f73d388f5b053f3afc357da49a2916f7e0ab9e7
parent bf604f28529a8d08730721e4e0452f142e3d2bec
parent 3a0a60b6b73380aa083a28f1be0f4552ce9749cf
author Baligh Uddin <baligh@google.com> 1408984461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408984461 +0000

am 3a0a60b6: (-s ours) am 5a849071: (-s ours) Import translations. DO NOT MERGE

* commit '3a0a60b6b73380aa083a28f1be0f4552ce9749cf':
  Import translations. DO NOT MERGE