tree 9a38b1544bfccb9448e916dd4817262638a91f4c
parent 44ba9cc22321b9d211176249f81e925dfa73bc05
parent 348e062a632e9e2b5a5a55afcd2cd20b5d487a94
author Baligh Uddin <baligh@google.com> 1366838861 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366838861 -0700

am 348e062a: (-s ours) Import translations. DO NOT MERGE

* commit '348e062a632e9e2b5a5a55afcd2cd20b5d487a94':
  Import translations. DO NOT MERGE