tree dc53677d0a66cb40d7698bb75a65b03f465879fe
parent fdd57525dd38ddb943122e4d7e34d80fd264737e
parent 0575170cc4c061531ff867a44a62b38e9a4e7aa2
author Baligh Uddin <baligh@google.com> 1412532181 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412532181 +0000

am 0575170c: (-s ours) am 35957dbd: (-s ours) Import translations. DO NOT MERGE

* commit '0575170cc4c061531ff867a44a62b38e9a4e7aa2':
  Import translations. DO NOT MERGE