tree 8d430fe286e67dc62ca456d3cd3c18a854bc18ce
parent eb76f9ad3ca133f18461ba312113e3c2a283ad70
parent ae6f96da46e752edcb8bb3f4b030f7a0b58d275f
author Nick Kralevich <nnk@google.com> 1545073733 -0800
committer android-build-merger <android-build-merger@google.com> 1545073733 -0800

Merge "use epoll_create1" am: 7cb89fec51
am: ae6f96da46

Change-Id: Ib4fb5d85f152fbcddd185433c027f234e83323c3