tree a2ec4359df85eec5b59dc572a710809cdc888d0f
parent 0ca7153e41483086588aa0a3ec4721567e0fb7b4
parent 699c7e4d15913f024b50497ad25f9166b22aa991
author Baligh Uddin <baligh@google.com> 1352308483 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352308483 -0800

am 699c7e4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

* commit '699c7e4d15913f024b50497ad25f9166b22aa991':
  Import translations. DO NOT MERGE