tree 9c30d16e36e2065afa4a15d25b8cc65827218330
parent ff11bce0978d56ce571454d16084028df4106e13
parent 4abacac32dcdc433b83b819ab6e03b958bbfb31c
author Andrew Hsieh <andrewhsieh@google.com> 1383526400 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383526400 -0800

am 4abacac3: Merge "Fix prototype of poll"

* commit '4abacac32dcdc433b83b819ab6e03b958bbfb31c':
  Fix prototype of poll