Commits
Brian Carlstrom authored and Android Git Automerger committed cd4a962a84fM
am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev * commit '13987fb43255ccb3802d415e32b1c5caf14291bb': Reverting public setSoWriteTimeout
Showing diff to13987fb4325