| commit | ba7336b4f5f7e0768423460eaf0b2d7265bedfba | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Tue Jun 14 15:22:12 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 14 15:22:12 2011 -0700 |
| tree | c8736f93a76a62c39e0eae0d1574f5bd3290936b | |
| parent | 386f67a15292c3662091ff8b281039ae1170012b [diff] | |
| parent | 9ee3975883cc4356d7b44f4e86d8c61589d2f42c [diff] |
am 9ee39758: (-s ours) am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc * commit '9ee3975883cc4356d7b44f4e86d8c61589d2f42c': DO NOT MERGE. may fix build on some version of gcc