commit | 736427e5f2c3f6978767da4dc972c361fdc9b233 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Sun Nov 02 19:56:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:56:00 2014 +0000 |
tree | f8d615c54e2d5a1b0271221d43a7c848d14da450 | |
parent | cd17f39384abbe7c061dc67112bfae077101f413 [diff] | |
parent | e4c5eb2a42af6ae37bc685ed5cfd765854fb76f5 [diff] |
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 'e4c5eb2a42af6ae37bc685ed5cfd765854fb76f5': Import translations. DO NOT MERGE