| commit | 867f2d494ab104e834538aff78956d881b8bfaf0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 28 07:13:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:13:49 2014 +0000 |
| tree | f38345d68a324670866c0ec66e16bdb7cef17ee5 | |
| parent | f5f7944e5417b1e41c3321cdb48d6c884f9e3355 [diff] | |
| parent | 9a3a3db19cc97307fbaa7a9e61204b359db026ad [diff] |
am 9a3a3db1: (-s ours) am 79d81b58: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '9a3a3db19cc97307fbaa7a9e61204b359db026ad':