OSDN Git Service

Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215 am: dfcc7dbad0
authorJunichi Uekawa <uekawa@google.com>
Thu, 13 Jul 2017 20:37:17 +0000 (20:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Jul 2017 20:37:17 +0000 (20:37 +0000)
am: 602a2ce0e0

Change-Id: I4d4946552edb444f4a3a7ea333f272a7408ec260


Trivial merge