| commit | a0e0b568cb8789d5418e50e75b93c3f62093c9cb | [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 | 6fb205a733931a18b7a55cc3ef341c19b33e7496 | |
| parent | 73a64f6817394e2e11fe220cac498e49f819b7cd [diff] | |
| parent | 80543fa0e9cb0bb65f0c1de8ee47ab0652178f60 [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