| commit | 93ecb9383a22c6828c9b332b7d1089ff97319999 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 26 16:12:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 16:12:34 2014 +0000 |
| tree | 3dbd7f99d5b4c4af35bc8f1d79db7db729122ca1 | |
| parent | 91c27888517c514d1da8cbcd76fdc4b437d193f8 [diff] | |
| parent | 28ffde5ebd33d5b693906a93087e6eea627cd8d0 [diff] |
am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" * commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0': Revert "Copy epoll(2) changes to minadb."