commit | 1d007f91b0ab508df1cca23729221380d632904a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Sun Nov 02 20:50:14 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 20:50:14 2014 +0000 |
tree | 029ca620dc57f4a76b169b0687e6ec1bc3d18b2d | |
parent | 97950748b639565e76b47bcf95ec527c870b5f4b [diff] | |
parent | 736427e5f2c3f6978767da4dc972c361fdc9b233 [diff] |
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