summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-01-25 16:25:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-25 16:25:16 -0800
commit9409bc2677582ab00ef7dce5c86c2b57c149a2fe (patch)
treea607faae1bc9aa1dfe89484ddfb49a1b61e29cc1
parent1aef06283286df8658b427885a6fffe9bdfeedbe (diff)
parentceddc751d7a2764da56a573de83202f30843c45b (diff)
downloadsystem_core-9409bc2677582ab00ef7dce5c86c2b57c149a2fe.zip
system_core-9409bc2677582ab00ef7dce5c86c2b57c149a2fe.tar.gz
system_core-9409bc2677582ab00ef7dce5c86c2b57c149a2fe.tar.bz2
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.
0 files changed, 0 insertions, 0 deletions