OSDN Git Service

Merge "Use <linux/eventpoll.h> to implement <sys/epoll.h>." am: 77463d81e6
authorElliott Hughes <enh@google.com>
Fri, 24 Feb 2017 17:00:34 +0000 (17:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Feb 2017 17:00:34 +0000 (17:00 +0000)
am: 37ae2185c2

Change-Id: I910b9fbc8b3ccfb8db71bfd90b9cb22f51766d79


Trivial merge