tree 7476c222b110dbbf9a7f9c091e2e7da06539de87
parent 4b93ac74273d00d1a5ec2533f0b7f3022295e757
parent 78f126e5a23280dfb4d1cba78cc87afa168ecb66
author Nick Kralevich <nnk@google.com> 1545084809 -0800
committer android-build-merger <android-build-merger@google.com> 1545084809 -0800

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

Change-Id: Ia00a035f2d671baabba7c1a2ed89b703e2241c2a