tree c21f3a5b301af9ac55259593c2e5dcbf7fb214fe
parent 830b77bc5c492d98eb0bc1ca515478c2e116991a
parent 790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a
author Elliott Hughes <enh@google.com> 1411498653 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411498653 +0000

am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."

* commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a':
  Switch adb to epoll(2).