| commit | 82c09c82b3baac3be7f972b0f0a6f90e74f923a8 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 27 23:16:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 23:16:48 2014 +0000 |
| tree | 8d2f5c22f54088be3981b01587ece4461009be94 | |
| parent | f9fba9fdf3053f356d3a129198d95903beb3b1d0 [diff] | |
| parent | ab3f2492401aa63d73fbf4de9068ee2281f2d98f [diff] |
am ab3f2492: (-s ours) am 1bc53e63: (-s ours) am e7a64624: (-s ours) am adff3f1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ab3f2492401aa63d73fbf4de9068ee2281f2d98f': Import translations. DO NOT MERGE