commit | 73b61394c11215bafcdf606cb806a69e4f83ef60 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Sat Apr 25 05:37:18 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 25 05:37:18 2015 +0000 |
tree | 989109556f502f2a7a8c1337b6c9a8829429c255 | |
parent | 37f1f232b6b6ed71ab41b071620140454b06690e [diff] | |
parent | fdd80681af3ac1c94f7ffbd2ecd382572868b65b [diff] |
am 2b57981b: am ae3154e3: am 2899c94b: Merge "Switch init to epoll." * commit '2b57981b05a3771bfce01e801581442e4b63299f': Switch init to epoll.