tree 37566c42958afc2e4b84deba4064b669315a99d8
parent 733fe099289c4fd0d1ef4cc960bb392114979c21
parent dfcc7dbad0365e643a9747c837ee310d7f43770e
author Junichi Uekawa <uekawa@google.com> 1499978086 +0000
committer android-build-merger <android-build-merger@google.com> 1499978086 +0000

Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215
am: dfcc7dbad0

Change-Id: I742ebc5174d809fa6f70324659f6e03798710679