| commit | 440185cdd383289fbf8afec353aa64fe0ed30773 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Oct 23 13:04:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 13:04:57 2014 +0000 |
| tree | 558789b53bf9241b08b9d4fab24f5d6852cd3146 | |
| parent | 3970568560f62c87d9ef7a1c0617c16b23271b6e [diff] | |
| parent | ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0 [diff] |
am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" * commit 'ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0':