Skip to content
Commit 13987fb4 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev

parents 7b879999 992f238d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment