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

am 996dcfde: am fd29c453: Import translations. DO NOT MERGE

* commit '996dcfde46425112f304ad997d2ec4797732e937':
  Import translations. DO NOT MERGE