| commit | 5b5f6ddfa84ec9e90c8b77899bb1a6096d1b1c56 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 21:00:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 21:00:43 2014 +0000 |
| tree | f439482e80559f310178bb050de770ca86fb0b23 | |
| parent | e477510104f7a31650974b827bab3ebdaf7b5427 [diff] | |
| parent | cf71886c2f66bc45d33b23b1fa504d1cf249fa30 [diff] |
am cf71886c: (-s ours) am 9d8c7598: (-s ours) am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'cf71886c2f66bc45d33b23b1fa504d1cf249fa30': Import translations. DO NOT MERGE