| commit | c886758ac4e49e91bb9f1a1db5db89bae6caf804 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jun 21 15:04:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 21 15:04:44 2013 -0700 |
| tree | 5c5f3f0dc7c9ac1a3a5a7310af0b58c8e91cfbd0 | |
| parent | 18a8b91a5ee97b7a6e8c0849b542ea765dc738a5 [diff] | |
| parent | 29b4c7889ba10c41da5d2ed0e9c7057eb051ccbd [diff] |
am 29b4c788: Merge "Fix non-blocking SocketChannel connects." * commit '29b4c7889ba10c41da5d2ed0e9c7057eb051ccbd': Fix non-blocking SocketChannel connects.