| commit | 5a009dcc58a46c41f1b54ccffca7d1317bbbff18 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sun Sep 23 12:25:31 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Sep 23 12:25:31 2012 -0700 |
| tree | 181948b38b2e58662ce3494301a4aef1c3bbfeeb | |
| parent | bda527eca601b27ae66b6a93819cbe934e5ec782 [diff] | |
| parent | 7ab7a8b582b29d34ec0fdbd0c727e225f350bb30 [diff] |
Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev