commit | c809b24199c48f08ef3bcffb35745cbeaec8bd44 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue May 20 00:23:08 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 00:23:08 2014 +0000 |
tree | ca21b120a7a2b26507054010b7ff042a1e90f36b | |
parent | b24da6218fc47cd4a38d44667435789ea2d03f8d [diff] | |
parent | a9b6b3c82ff6b5be2d7c8226d9532edf8612f77e [diff] |
am a9b6b3c8: am f7c9b701: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect" * commit 'a9b6b3c82ff6b5be2d7c8226d9532edf8612f77e': Bound the ADB connect time with a non-blocking connect