tree be04fd9c88a81ee73bfd1da2188957e29e68ebe4
parent e1baa9c79ffd9240a20bab88c865afae5ce53e59
parent dc3ad87c04348c925aa86863ed6d25f18a8c6c36
author Jeff Brown <jeffbrown@google.com> 1287245563 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287245563 -0700

am dc3ad87c: am 78a76fea: Merge "Revert to using epoll_wait()." into gingerbread

Merge commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36'

* commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36':
  Revert to using epoll_wait().