| commit | 736fd4a870781b9cf8a59c95fac8a518a462c49a | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Sep 25 22:32:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 25 22:32:18 2014 +0000 |
| tree | 615c4586e9b07a0f1014e873a7d76bfdc4241bbb | |
| parent | fee8ffb8dacc7f3c18f1976af39c51a24eb206d6 [diff] | |
| parent | 8e1e54154bc7a5e9dee206735474186c2276b111 [diff] |
am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2)."" * commit '8e1e54154bc7a5e9dee206735474186c2276b111': Revert "Switch adb to epoll(2)."