| commit | 970c3947f39e8c880dd9f32002f9c7a9cdc96d54 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Sep 23 18:57:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 23 18:57:44 2014 +0000 |
| tree | 24108d07dade3925b8fff8d4997522ca0312db42 | |
| parent | 574443d8956802f35347cac7fae7eb16240e3c16 [diff] | |
| parent | 530b61e0b5f154e5f38853c10a28e0ea6f41c2ca [diff] |
am 530b61e0: Merge "Copy epoll(2) changes to minadb." * commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca': Copy epoll(2) changes to minadb.