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