diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-08-20 11:15:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-20 11:15:57 -0700 |
| commit | 758401da7c3315fd1bf4146acfc5501af6842de2 (patch) | |
| tree | d447fd89847f84de6a91e75a9e3ca2009cdb89e6 /annotations/generate_annotated_java_files.py | |
| 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
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions