tree 207a637932fa23c9127f1a47596decb328c29642
parent 8a65899e8a58047c1a29e243719ec25bf59a3448
parent 5b4a1767f6e4802c99071305e5b69b1ed22ad292
author Dan Albert <danalbert@google.com> 1411683976 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411683976 +0000

am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""

* commit '5b4a1767f6e4802c99071305e5b69b1ed22ad292':
  Revert "Switch adb to epoll(2)."