tree c456f4fdb04f73aee301a696722bcf84ba749bfc
parent 31df32bed8f4cdb77ca8af91da58c18cccf5d43a
parent 7ac0eb2f4ad28907483bfdb768af075997b195c0
author Baligh Uddin <baligh@google.com> 1414958010 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414958010 +0000

am 7ac0eb2f: (-s ours) am fee3f152: (-s ours) am 094fb74a: (-s ours) am 185eb1ee: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev

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