| commit | 50758abdc8db6ec4ef4dc487b86b24e27548948f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Oct 23 15:07:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 15:07:56 2014 +0000 |
| tree | 3f9cac9b620358c08a1547270a782c9ff00bba68 | |
| parent | a7a0ed94a2dbfd22e6313250daf11c0746487da1 [diff] | |
| parent | e5ce559fb620ddea535b428d4cc21da701a5e4e7 [diff] |
am e5ce559f: am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb." * commit 'e5ce559fb620ddea535b428d4cc21da701a5e4e7':