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)
commit7f190f8ce68989af7f9d0aa94fc6f3c02d82631e
treeb6220f7608186f7cff6ad297b441217e1352abdd
parentdc4fde491663a7b11e9f70861bb3f6223f89441a
parent37ae2185c2075c2c26f5a7f13c594aa184dbe6eb
Merge "Use <linux/eventpoll.h> to implement <sys/epoll.h>." am: 77463d81e6
am: 37ae2185c2

Change-Id: I910b9fbc8b3ccfb8db71bfd90b9cb22f51766d79