tree 4dc3db074319ead8d0cbe4ffd06a23154fa039b3
parent f4da198a53812adbcab21b8a1e5020e0c1610576
parent 4d9ab503876e497c645a9cdfbacfef9a7c7b6d4d
author Brian Carlstrom <bdc@google.com> 1363537859 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363537859 -0700

am 4d9ab503: am 6b948b63: Merge "Assorted socket fixes related to test_SSLSocket_setSoWriteTimeout failure investigation"

* commit '4d9ab503876e497c645a9cdfbacfef9a7c7b6d4d':
  Assorted socket fixes related to test_SSLSocket_setSoWriteTimeout failure investigation