tree 574d0718919bdcf62fa1172d3476fa658bcfeb66
parent 03c79df9f3dca05f767493b4ffbcabb1eab44434
parent 13157532a7502d700a75c4f6bf45a10e5b52fc5c
author Baligh Uddin <baligh@google.com> 1404682967 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682967 +0000

am 13157532: (-s ours) am 2ea40009: (-s ours) am 23b816b1: (-s ours) Import translations. DO NOT MERGE

* commit '13157532a7502d700a75c4f6bf45a10e5b52fc5c':
  Import translations. DO NOT MERGE