Skip to content
Commit da37c230 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)"... 

Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" am: f1d119cc am: 97b24c2f am: c150ad33
am: 8c56fbd3

Change-Id: Ia94dc2ae051b6053b4ac438a4894e0c18b30bfb6
parents 632bd490 8c56fbd3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment