commit | 13987fb43255ccb3802d415e32b1c5caf14291bb | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Wed Sep 26 16:05:00 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 26 16:05:00 2012 -0700 |
tree | 84e46d95605b6cf753a65a0ffbaf2d84ab40d4cf | |
parent | 7b879999fe2bef549ed1c04259fcd7f07e10e83b [diff] | |
parent | 992f238d13fff7c21b60ef6958784a4ed2156784 [diff] |
Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev