| commit | 80926faae1999d30b8620a249385518e4b318938 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 28 07:13:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:13:34 2014 +0000 |
| tree | f38345d68a324670866c0ec66e16bdb7cef17ee5 | |
| parent | fe328ad7f0a0a4cee317259ce3fb9de7bba2e919 [diff] | |
| parent | b92cb150473914c8bc9396aa6dc674054f296882 [diff] |
am b92cb150: (-s ours) am 7e589b15: (-s ours) am 93321a10: (-s ours) am ed04bd9e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b92cb150473914c8bc9396aa6dc674054f296882':