| commit | 2be73397c69fc4a70b691b7a2acf5068f0cf5d1d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Oct 31 00:00:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 00:00:16 2014 +0000 |
| tree | 54f7795ef819847fc5b2852d9e7adf1dd109f383 | |
| parent | 7e247e2e7f7edfe5cf7b038def4c82d0e13457b8 [diff] | |
| parent | dd42fb6dda5ad200b00c9bd7f8c81cca346d8bc2 [diff] |
am dd42fb6d: (-s ours) am f658b88f: (-s ours) am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'dd42fb6dda5ad200b00c9bd7f8c81cca346d8bc2': Import translations. DO NOT MERGE