commit | 8c56fbd38d6ea66703e4a7bde99ecfa13db7910f | [log] [tgz] |
---|---|---|
author | Tobias Thierer <tobiast@google.com> | Thu Aug 04 11:15:13 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 04 11:15:13 2016 +0000 |
tree | 7609327040f0a33be2887868ce88db91666bcf9a | |
parent | efd96481c3f0af683cc41ed92d98b4d0a5436db6 [diff] | |
parent | c150ad3357828bf72ac54a0cba42a85b214b0798 [diff] |
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" am: f1d119ccd3 am: 97b24c2f6a am: c150ad3357 Change-Id: I215ffb68fa4b223f98b49593d4ab6b3b7590b845