| commit | b66e30373c1c0ed2496032aafe6820b148a6b3fc | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Sep 26 16:09:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 16:09:29 2012 -0700 |
| tree | 26bd9bf2b41b81f668640cd1c3f52677e96a737d | |
| parent | 574fbc738d48456479daf6788a4e103484ff8694 [diff] | |
| parent | 0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a [diff] |
am 0b6cb84b: am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev * commit '0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a': Reverting public setSoWriteTimeout