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