| commit | b42f141315ae0929325335645d397db04a500c88 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon May 19 23:26:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 19 23:26:22 2014 +0000 |
| tree | 8d262bd2c849146f841d621e3915e015335914d6 | |
| parent | c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e [diff] | |
| parent | 0e71e3ab9cf66f41645ea286c7e62ed2b657ca38 [diff] |
am 0e71e3ab: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect" * commit '0e71e3ab9cf66f41645ea286c7e62ed2b657ca38': Bound the ADB connect time with a non-blocking connect