| commit | 10f70599c6d98bcd05b86b9e70408d84faf5c05f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 21 16:40:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 16:40:58 2014 +0000 |
| tree | 9b1da6db4c0922e878f94a8f611b07b77ac1c2d9 | |
| parent | 1a2a0e02277f293bbe1f2be281dc5fd58b6d4ef3 [diff] | |
| parent | fea8e23c160d74b8cc093ebad561ba9a95963ee9 [diff] |
am 0f661f4b: (-s ours) Import translations. DO NOT MERGE * commit '0f661f4b9b83015ab556400c8c960ce0ad0cd428': Import translations. DO NOT MERGE