| commit | 1cc4683f140636188466ce753cea670a1bff1617 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Tue May 13 15:20:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:20:55 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | f2c0b5135d13813aa1e8577a9c8bde8e28912e67 [diff] | |
| parent | 39e47ae801b2aed7d5d00a17ad61ab8793980e71 [diff] |
am 39e47ae8: am 08f9413c: am 96dc8d39: am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic" * commit '39e47ae801b2aed7d5d00a17ad61ab8793980e71':