| commit | c682559d3c39aa4503d5c4d60ae046393aa45b79 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Jul 27 14:01:23 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 27 14:01:23 2011 -0700 |
| tree | 0b007da64ed65f7e8df07b1077b97534bc21ddf1 | |
| parent | 20bf46af14130314ae1aeb1e5482c38556c8f0f8 [diff] | |
| parent | 4d21c7732c978a593dfa78f8da1fed7511b38e95 [diff] |
am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" * commit '4d21c7732c978a593dfa78f8da1fed7511b38e95': DO NOT MERGE. may fix build on some version of gcc