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