OSDN Git Service

am 04acf6c8: merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 21 Jun 2010 17:54:48 +0000 (10:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jun 2010 17:54:48 +0000 (10:54 -0700)
Merge commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce'

* commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce':
  Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)


Trivial merge