tree 40b0d2cc9da2e7113e06c184b8c1894f451bc211
parent 6e7f14d9f707c295765e119800acfa0621a347cb
parent 5a215d7817baf190a8af76674303b0d50ce67c07
author Treehugger Robot <treehugger-gerrit@google.com> 1495500480 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1495500481 +0000

Merge changes Iefdc1662,I8ee9ce62

* changes:
  Don't define IN_CLOEXEC/IN_NONBLOCK for pre-L.
  Undef EPOLL_CLOEXEC for pre-L.