OSDN Git Service

Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215 am: dfcc7dbad0 am: 602a2ce0e0
authorJunichi Uekawa <uekawa@google.com>
Thu, 13 Jul 2017 20:45:56 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Jul 2017 20:45:56 +0000 (20:45 +0000)
commit60fb60616c9873b44296088bb4294a608c6fdc1e
tree79c1f1cc37e7c627810f1d84924c925f1f635ab1
parent5139cdf9279015ef4c6e6a9452ae4a44f14bcba2
parent189527f13f02af0d6644b7a12cdb49347d5ffc93
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215 am: dfcc7dbad0 am: 602a2ce0e0
am: 189527f13f

Change-Id: Ie4cdfd04c1acf48c802b233eb34b2417c859ae04