| commit | 39e47ae801b2aed7d5d00a17ad61ab8793980e71 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu May 08 18:36:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 18:36:48 2014 +0000 |
| tree | d3a42139d1bca4d314b6ac044c5d456553ab345a | |
| parent | a71ffecabab6f88e7ba5f5ff3045183369f1e702 [diff] | |
| parent | 08f9413ce2b463b98ee30e079d4200f05f48cc11 [diff] |
am 08f9413c: am 96dc8d39: am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic" * commit '08f9413ce2b463b98ee30e079d4200f05f48cc11': Update epoll.h from bionic