tree 029ca620dc57f4a76b169b0687e6ec1bc3d18b2d
parent 97950748b639565e76b47bcf95ec527c870b5f4b
parent 736427e5f2c3f6978767da4dc972c361fdc9b233
author Geoff Mendal <mendal@google.com> 1414961414 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414961414 +0000

am 736427e5: (-s ours) am e4c5eb2a: (-s ours) am ac8f61be: (-s ours) am 42bc3b3b: (-s ours) am 640e4ba8: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev

* commit '736427e5f2c3f6978767da4dc972c361fdc9b233':
  Import translations. DO NOT MERGE