| commit | 632bf8668a53a55d85ea982f2875d1f3b47d3d5a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Sep 23 20:56:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 23 20:56:38 2014 +0000 |
| tree | 77acb4ca27611196a6a47c9c6ed9d2bb47244ab9 | |
| parent | 1d30c2fe19fdbdfd6e5f52102247cf01b87e586e [diff] | |
| parent | 970c3947f39e8c880dd9f32002f9c7a9cdc96d54 [diff] |
am 970c3947: am 530b61e0: Merge "Copy epoll(2) changes to minadb." * commit '970c3947f39e8c880dd9f32002f9c7a9cdc96d54': Copy epoll(2) changes to minadb.