OSDN Git Service

(root) / android-x86 / dalvik.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc8c750 c8d7180)
am c8d71801: resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 22:18:45 +0000 (15:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Jul 2011 22:18:45 +0000 (15:18 -0700)
* 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


Trivial merge
dalvik
About OSDN
Find Software
Develop Software
Help