tree 05d3401cd1d13574bc9a1cd4b8bdab023f516dc9
parent 8a29ea7e5075837ba4e83c238f1ebfd5a238322f
parent 7cc22e7254d9db1ef3dc7fab51537aea5e9d4cb9
author Baligh Uddin <baligh@google.com> 1399388290 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399388290 +0000

am 7cc22e72: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-algol

* commit '7cc22e7254d9db1ef3dc7fab51537aea5e9d4cb9':
  Import translations. DO NOT MERGE