tree 18a82ed836d0558ab9ee3c09459acbc0a12e773f
parent e95ed95f05d22929e0bb8610a83c4e6a01fb3a33
parent 28ffde5ebd33d5b693906a93087e6eea627cd8d0
author Dan Albert <danalbert@google.com> 1411747943 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411747943 +0000

am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""

* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
  Revert "Copy epoll(2) changes to minadb."