tree 834cb3d4b7cbd002e62a6bc3e3a51de89e6b9f58
parent 9d2ddcc99176c76fcd7b7a2a845fac41864fe702
parent 6b948b63a91693101dc8f727fbf92e599ead0d8b
author Brian Carlstrom <bdc@google.com> 1363537569 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363537569 -0700

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

* commit '6b948b63a91693101dc8f727fbf92e599ead0d8b':
  Assorted socket fixes related to test_SSLSocket_setSoWriteTimeout failure investigation