tree 7ba9002362cf777ebc6613be02ecc663823ed2e6
parent fb2796ace39d39bebc3faa2c730ec87bf03186b7
parent 239204a1a124c66d3465e2fd44a60c776a62123d
author Baligh Uddin <baligh@google.com> 1408164226 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408164226 +0000

am 239204a1: (-s ours) am 758853c4: (-s ours) am 02cb9e79: (-s ours) am c029b460: (-s ours) am 8462ebf7: (-s ours) Import translations. DO NOT MERGE

* commit '239204a1a124c66d3465e2fd44a60c776a62123d':
  Import translations. DO NOT MERGE