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