tree 84b2c274a8dac306b6a9499a02396e9a6b13cb46
parent ecd1d94f14585aceaf86d257f12719b3e6552522
parent 8e1e54154bc7a5e9dee206735474186c2276b111
author Dan Albert <danalbert@google.com> 1411684346 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411684346 +0000

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

* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
  Revert "Switch adb to epoll(2)."