| commit | 8418cd4dea92381fee72604dcd8c0e013fb1ee87 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 10 12:46:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 12:46:17 2012 -0700 |
| tree | fd7060e260e42acb9f62841a0a6cd3d92e6901d4 | |
| parent | 796f0ebea3e6be486e9052f78ecaade2a02f26ca [diff] | |
| parent | 84d4afa66e40478a813b738e943d8e9e54abf342 [diff] |
am 84d4afa6: am 91afae6c: resolved conflicts for merge of dd14acc3 to jb-mr1-dev * commit '84d4afa66e40478a813b738e943d8e9e54abf342': Modify full_mips-eng build in line with the full-eng build