commit | e5ce559fb620ddea535b428d4cc21da701a5e4e7 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Oct 23 13:04:56 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 13:04:56 2014 +0000 |
tree | 558789b53bf9241b08b9d4fab24f5d6852cd3146 | |
parent | dd57886ce6ec100ce212b7d8d1f6991a4b77e004 [diff] | |
parent | 78a30278607f0e57ace53eb5df7e5f7f196387a4 [diff] |
am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb." * commit '78a30278607f0e57ace53eb5df7e5f7f196387a4':