tree 1360714bf3a915e45af96d6020f516da93036425
parent 8c444b61b3d3fab99f9bd617a8d7705c81e8da7a
parent e2f547060678ed4199b9f398b95643e08e6b6959
author Elliott Hughes <enh@google.com> 1411167758 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411167758 +0000

am e2f54706: Merge "Remove unused HAVE_EPOLL."

* commit 'e2f547060678ed4199b9f398b95643e08e6b6959':
  Remove unused HAVE_EPOLL.