am 04acf6c8: merge from froyo-plus-aosp

Merge commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce'

* commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce':
  Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)
This commit is contained in:
The Android Open Source Project
2010-06-21 10:54:48 -07:00
committed by Android Git Automerger

Diff Content Not Available