| commit | dd42fb6dda5ad200b00c9bd7f8c81cca346d8bc2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 30 23:43:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 23:43:21 2014 +0000 |
| tree | ad107a6844deb3ff8085c9e53f1daf0b6a03ca22 | |
| parent | 721090aeac79c858ead819447d915e58ba0ee570 [diff] | |
| parent | f658b88fd1ee3bd92a8c7f32560217fd9805f7d6 [diff] |
am f658b88f: (-s ours) am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'f658b88fd1ee3bd92a8c7f32560217fd9805f7d6': Import translations. DO NOT MERGE