tree cba62d0d64153aa2169651696bc238591341d679
parent fb6068711e9082e8c3732bafbba78c750536283d
parent 79eaeaf70bfa970789b4e81fe2e0e0384c878b59
author Baligh Uddin <baligh@google.com> 1414085128 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085128 +0000

am 79eaeaf7: (-s ours) am 33a5fd70: (-s ours) am 415c34b9: (-s ours) Import translations. DO NOT MERGE

* commit '79eaeaf70bfa970789b4e81fe2e0e0384c878b59':
  Import translations. DO NOT MERGE