| commit | f54c7016261fefdf146137d50b63ca91ac21b80e | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Mon Jul 11 15:18:45 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 11 15:18:45 2011 -0700 |
| tree | c14ca5fdccd7db1044852743cb1256588a9e7351 | |
| parent | cc8c750a30dee0b7bac1281533581e86d07b9c8e [diff] | |
| parent | c8d718012b0ac4abf668a9f494c33d2dd8a314e5 [diff] |
am c8d71801: resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp * commit 'c8d718012b0ac4abf668a9f494c33d2dd8a314e5': Only use O_BINARY if it is defined (windows compatibility) Update to allow x86-atom build for FI on Gingerbread Combined patch from master branch