| commit | 44f57c061a9b0b91bf5465cb17174c07fca212a4 | [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 | 6c43eb4ce620ab4dafe06cd471505693a303a2ea | |
| parent | 461653aa737f8aefd7a1d37c07de5c6e5a1c046f [diff] | |
| parent | 060c1a8f1ac7a2434d8a8e010a78b82064dea094 [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