tree 6a4b0ee0c8723411becfc93b29c8d11bbe03fc55
parent b78c30c394d968bd7b1aba0c008f3012abe96403
parent 649d2d35dc4bbb1a4ded0b2e6bc37532591a1d21
author Nick Kralevich <nnk@google.com> 1545084325 -0800
committer android-build-merger <android-build-merger@google.com> 1545084325 -0800

Merge "use epoll_create1" am: a8d712ec50
am: 649d2d35dc

Change-Id: I3067b7381fca78ea7ed862f81dee9efac2f69f1b