| commit | f1fb3fa2ffcd403b0f6b3ed4f4ffa4ec82c14f82 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 04:41:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 04:41:43 2014 +0000 |
| tree | ca8fa81bcf0149c94b3659fc69bf665ab41e2f15 | |
| parent | 02e25240b59d7934e669d8b549378ad38fc56200 [diff] | |
| parent | f5d0d89f186d8a0411e38c227ea369f25f428bc9 [diff] |
am f5d0d89f: (-s ours) am c285fd7b: (-s ours) am a033e8fd: (-s ours) am 9f78f924: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f5d0d89f186d8a0411e38c227ea369f25f428bc9':