tree 93e0c415e060fb33b5617ee4c19d9b9d51491188
parent 52e5e55cac4e630e4eac59c387815aa307194540
parent ae3154e3968e991fb1e9a6b47bedd1e0819f7925
author Elliott Hughes <enh@google.com> 1429939303 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429939303 +0000

am ae3154e3: am 2899c94b: Merge "Switch init to epoll."

* commit 'ae3154e3968e991fb1e9a6b47bedd1e0819f7925':
  Switch init to epoll.