commit | b94b25bce9597a672a5f39d2b17d66314e565e61 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Fri Sep 26 19:39:37 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 19:39:37 2014 +0000 |
tree | 85ce8911c868b9f55b4b153123d6f5472197d3e0 | |
parent | 7a054ec9a7bd464411a1593f8fd146bb49a56d66 [diff] | |
parent | 93ecb9383a22c6828c9b332b7d1089ff97319999 [diff] |
am 93ecb938: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" * commit '93ecb9383a22c6828c9b332b7d1089ff97319999': Revert "Copy epoll(2) changes to minadb."