tree dbab1b11f822afd53385097c3d5b38464a9fc88c
parent 0f260324a9cee5122d67096c1cd281979d21b712
parent 0961a545d6237786162c8f2c82f348ad50db2e64
author Baligh Uddin <baligh@google.com> 1398805920 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398805920 +0000

am 0961a545: (-s ours) Import translations. DO NOT MERGE

* commit '0961a545d6237786162c8f2c82f348ad50db2e64':
  Import translations. DO NOT MERGE