tree 558789b53bf9241b08b9d4fab24f5d6852cd3146
parent 3970568560f62c87d9ef7a1c0617c16b23271b6e
parent ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0
author Dan Albert <danalbert@google.com> 1414069497 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414069497 +0000

am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""

* commit 'ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0':