tree 05d3401cd1d13574bc9a1cd4b8bdab023f516dc9
parent d7f14edf73704c2ea11904b77e6ffb9e04f698a7
parent 7361d5e156af3b96359e3e53ec849363452d6ec5
author Baligh Uddin <baligh@google.com> 1399388304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399388304 +0000

am 7361d5e1: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur12-dev

* commit '7361d5e156af3b96359e3e53ec849363452d6ec5':
  Import translations. DO NOT MERGE