am 382b877c: am d7bd3543: Merge "Switch from getdtablesize(3) to sysconf(3)."
authorDan Albert <danalbert@google.com>
Tue, 17 Jun 2014 09:35:44 +0000 (09:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Jun 2014 09:35:44 +0000 (09:35 +0000)
* commit '382b877cf52e23faee17fdaa9404d5feebed2bb4':
  Switch from getdtablesize(3) to sysconf(3).


Trivial merge