| commit | 4d21c7732c978a593dfa78f8da1fed7511b38e95 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Jul 27 13:59:57 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 27 13:59:57 2011 -0700 |
| tree | 923fedb711db5824390f501569bc756bdb7caa45 | |
| parent | b0878223db87700cdc988a6d9197ca4e3c4772db [diff] | |
| parent | 4d1fa60bfe660fd0fc6671116da597c0027cbb16 [diff] |
am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" * commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16': DO NOT MERGE. may fix build on some version of gcc