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