commit | 44bb2c033675bf74e37c0761d852509b39ce9dc9 | [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 | fbe4ffd19d16a7b79a56a36ee6d0e2ce9bf48ced | |
parent | e7a501a27400c35a9a1b21b7ae4b08ec60d8e1ce [diff] | |
parent | 7744c091390eca5f206c1c100d8ed68cb2a598ac [diff] |
am 8e1e5415: am 7744c091: Merge "Revert "Switch adb to epoll(2)."" * commit '8e1e54154bc7a5e9dee206735474186c2276b111': Revert "Switch adb to epoll(2)."