| commit | fba44526c061882ac8c9d62e794e3102a20fc719 | [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 | bbf83ec5be558d536e86597a4eb2e0e0741a3a62 | |
| parent | 5bf7250ab79b961a412ebbd671c976784f0208a1 [diff] | |
| parent | e32af36b39f13a4f1426f97489783188c20e27c9 [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