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)
* commit 'ceddc751d7a2764da56a573de83202f30843c45b':
  Permit 0 length writes.
  Let SocketClient users write binary data to clients.


Trivial merge