Commits
Brian Carlstrom authored and Android Git Automerger committed b66e30373c1M
am 0b6cb84b: am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev * commit '0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a': Reverting public setSoWriteTimeout
Showing diff to0b6cb84b909