am ceddc751: resolved conflicts for merge of 63e70b24 to honeycomb-plus-aosp

Browse source

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

...

This commit is contained in:

Brad Fitzpatrick 2011-01-25 16:25:16 -08:00 committed by Android Git Automerger

parent 1aef062832 ceddc751d7

commit 9409bc2677

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available