| commit | e28fbd61d8692e4b8df34ae3971e65e309bf2108 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Tue Jun 28 18:58:20 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 28 18:58:20 2011 -0700 |
| tree | 0154a39d8c1b08efb8d5291b8ff940cee9997e4c | |
| parent | 8994730fe39570c7807561de38407a8b22230e8a [diff] | |
| parent | adf5914b390061e48a86c9f55e68899cfa526841 [diff] |
am adf5914b: (-s ours) am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread * commit 'adf5914b390061e48a86c9f55e68899cfa526841': DO NOT MERGE. may fix build on some version of gcc