| commit | 6be68be8c96c02ca8d308789a0340debfaf42265 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:13:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:13:37 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | 7d8b4516e271db1fe9ea8b4295cf1e1127b5d5dd [diff] | |
| parent | 00ccd494b268ca584e451b5d397bf4a0af3c9ea7 [diff] |
am 00ccd494: (-s ours) am 9bd4f416: (-s ours) am 9e7e13c8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '00ccd494b268ca584e451b5d397bf4a0af3c9ea7':