tree 8e932ad0f6147550bc4d2b31d74076bfc8025e70
parent a802b8374a22da9f52541e1fc286dcbdb1cfa1b4
parent ff856a2b927aaadb189181d2cd9dd08dc98456a4
author Robert Greenwalt <rgreenwalt@google.com> 1338416609 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338416609 -0700

am ff856a2b: Merge "Add error handling to SocketClient::sendData"

* commit 'ff856a2b927aaadb189181d2cd9dd08dc98456a4':
  Add error handling to SocketClient::sendData