tree 35f0f64ed455ff56a9d620be9d69cce14b3024a1
parent d0bbccc12753ee0c2581864867cb31852f6db722
parent d1759cb7334fe311e601c36876f509af9c78a9a9
author Baligh Uddin <baligh@google.com> 1411489023 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411489023 +0000

am d1759cb7: (-s ours) am 79576dfb: (-s ours) am 1d6b8a6e: (-s ours) am a27157d4: (-s ours) Import translations. DO NOT MERGE

* commit 'd1759cb7334fe311e601c36876f509af9c78a9a9':
  Import translations. DO NOT MERGE