tree 2c2bcf5bef251496d21c874c4e09deb2f698de43
parent 45f7fde3c96b99d23f188bec7a269734bb1d0d35
parent 0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0
author The Android Open Source Project <initial-contribution@android.com> 1277500881 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277500881 -0700

am 0e5a6b12: merge from froyo-plus-aosp

Merge commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0'

* commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0':
  Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
  AndroidConfig: define HAVE_PTHREAD_SETNAME_NP