OSDN Git Service

am ceddc751: resolved conflicts for merge of 63e70b24 to honeycomb-plus-aosp
authorBrad Fitzpatrick <bradfitz@android.com>
Wed, 26 Jan 2011 00:25:16 +0000 (16:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 00:25:16 +0000 (16:25 -0800)
commit9409bc2677582ab00ef7dce5c86c2b57c149a2fe
treea607faae1bc9aa1dfe89484ddfb49a1b61e29cc1
parent1aef06283286df8658b427885a6fffe9bdfeedbe
parentceddc751d7a2764da56a573de83202f30843c45b
am ceddc751: resolved conflicts for merge of 63e70b24 to honeycomb-plus-aosp

* commit 'ceddc751d7a2764da56a573de83202f30843c45b':
  Permit 0 length writes.
  Let SocketClient users write binary data to clients.