tree fba5d1543142c01822a63e0150f5c91f59d1d660
parent 393e559ddc06e8698841f8e141f5a5e24cffb942
parent 6f523cda13094bf493cdf37e7ecc480bb5a37a2b
author Robert Greenwalt <rgreenwalt@google.com> 1338417200 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338417200 -0700

am 6f523cda: am 7bb1b958: am ff856a2b: Merge "Add error handling to SocketClient::sendData"

* commit '6f523cda13094bf493cdf37e7ecc480bb5a37a2b':
  Add error handling to SocketClient::sendData