commit | 0128b2c752456e0b0b1ee9842ad7d7cc63be3e6b | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue May 14 15:01:33 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 14 15:01:33 2013 -0700 |
tree | 11bb8122dc1c967cc31cce35b424cda40f14ccb7 | |
parent | 7c7f0989952ad7b21ffa79eeac6e3892e0443b67 [diff] | |
parent | 01678789bca18d1a4894ae7f987f847b5ae0ce62 [diff] |
am 01678789: am 5b7b2809: Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events" * commit '01678789bca18d1a4894ae7f987f847b5ae0ce62': epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events