| commit | c18dcedd78d1e5218e39596dee6b58b979babbd7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 07:19:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:19:47 2014 +0000 |
| tree | 3adaee92a711e15e92093b3b6d9e5de3aa258de8 | |
| parent | 0caa1b2d654dfb9c71f982027cc42d60acd1eaa8 [diff] | |
| parent | f3715e4548f8a4f4e461bb24e131757d47f5c101 [diff] |
am f3715e45: (-s ours) am 2a0abe18: (-s ours) am 11eedd38: (-s ours) am 9dd95f2b: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f3715e4548f8a4f4e461bb24e131757d47f5c101':