tree 85ce8911c868b9f55b4b153123d6f5472197d3e0
parent 7a054ec9a7bd464411a1593f8fd146bb49a56d66
parent 93ecb9383a22c6828c9b332b7d1089ff97319999
author Dan Albert <danalbert@google.com> 1411760377 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411760377 +0000

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

* commit '93ecb9383a22c6828c9b332b7d1089ff97319999':
  Revert "Copy epoll(2) changes to minadb."