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)
commite93c115ab13e38c0a7e32d98f16aa92d37fc531c
tree9768fde6180a592e54da1a27c75274e710e48240
parent70465614e14a87f547cdd1b82b0b270b87d215c1
parent04acf6c80ee1fbe64c3915da1255e8ce4e7798ce
am 04acf6c8: merge from froyo-plus-aosp

Merge commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce'

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