| commit | 6ee44c8aaf26cdd0b43905fb73bbfb9f4249d82f | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Oct 23 15:07:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 15:07:57 2014 +0000 |
| tree | 3f9cac9b620358c08a1547270a782c9ff00bba68 | |
| parent | 8e76d2b00549fdc576c282f3845ced4550c342e2 [diff] | |
| parent | 440185cdd383289fbf8afec353aa64fe0ed30773 [diff] |
am 440185cd: am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" * commit '440185cdd383289fbf8afec353aa64fe0ed30773':