am 04acf6c8: merge from froyo-plus-aosp

Browse Source

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

parent 70465614e1 04acf6c80e

commit e93c115ab1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available