tree 6a4b0ee0c8723411becfc93b29c8d11bbe03fc55
parent acdb8d8d188090afd0e12993385cac34cf912c98
parent a8d712ec503d97a942847717cefae8e0c52b7861
author Nick Kralevich <nnk@google.com> 1545084086 -0800
committer android-build-merger <android-build-merger@google.com> 1545084086 -0800

Merge "use epoll_create1"
am: a8d712ec50

Change-Id: I9ddf1a6a059db39ad79d45915f43d9ef6cc456a9