From: Elliott Hughes <enh@google.com>
Date: Fri, 24 Feb 2017 17:00:34 +0000 (+0000)
Subject: Merge "Use <linux/eventpoll.h> to implement <sys/epoll.h>." am: 77463d81e6
X-Git-Tag: android-x86-8.1-r1~205^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f190f8ce6;p=android-x86%2Fbionic.git

Merge "Use <linux/eventpoll.h> to implement <sys/epoll.h>." am: 77463d81e6
am: 37ae2185c2

Change-Id: I910b9fbc8b3ccfb8db71bfd90b9cb22f51766d79
---

7f190f8ce68989af7f9d0aa94fc6f3c02d82631e