tree 562c41b55c37e932aff13d622c91c1c38c689e85
parent 40138b630c661f83d28770e118cbbb757cc6b508
parent ccfb7619f44b6fe96610d3ce431ba823dd783994
author Tianjie Xu <xunchang@google.com> 1478646564 +0000
committer android-build-merger <android-build-merger@google.com> 1478646564 +0000

DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131
am: ccfb7619f4  -s ours

Change-Id: If730d293efe1076a33555863fb6122ddde77694c