| commit | 758401da7c3315fd1bf4146acfc5501af6842de2 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Aug 20 11:15:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 20 11:15:57 2012 -0700 |
| tree | d447fd89847f84de6a91e75a9e3ca2009cdb89e6 | |
| parent | c704401332c808551a20bf8e4dc97920d458ac6c [diff] | |
| parent | 2a4282c155ac031e6301be0eb5bb1229655bdee2 [diff] |
am 2a4282c1: Merge "Restore ability for SSLSocket.close() to interrupt reads and writes" * commit '2a4282c155ac031e6301be0eb5bb1229655bdee2': Restore ability for SSLSocket.close() to interrupt reads and writes