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