| commit | 1265458c62e66f6b9f271e7d72c00a729005b8f9 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Wed Jul 13 14:54:05 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 13 14:54:05 2011 -0700 |
| tree | 6e13246e615d0dd8f2c76a7e8af680a9c736556e | |
| parent | 4c8b7b0df73540fc3a93305914ba841cd43d3997 [diff] | |
| parent | f54c7016261fefdf146137d50b63ca91ac21b80e [diff] |
am f54c7016: am c8d71801: resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp * commit 'f54c7016261fefdf146137d50b63ca91ac21b80e': 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