commit | 628e4b767fb5539c02e7a3984e49acdb5dfd9dcd | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Thu Sep 25 22:44:16 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 25 22:44:16 2014 +0000 |
tree | 82997cdb335f4c417404654a4ec8b20caebae7e6 | |
parent | c15279faede86b41d7a748a7a1ed60bac01ec1e4 [diff] | |
parent | 0df62a7e1511667043ced8f57b2dab072fb88dd5 [diff] |
am 0df62a7e: am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2)."" * commit '0df62a7e1511667043ced8f57b2dab072fb88dd5': Revert "Switch adb to epoll(2)."