tree 2709896084903ae2f90033a53afa633c6f128c7b
parent b9d75acace816146077651e9bcf5a8d54a1ff653
parent f5a2f6e963b4c82adbb129b2df460594524ebedf
author Elliott Hughes <enh@google.com> 1456253482 +0000
committer android-build-merger <android-build-merger@google.com> 1456253482 +0000

Merge "Clean up CLOEXEC in SocketListener." am: ed83cfba68
am: f5a2f6e963

* commit 'f5a2f6e963b4c82adbb129b2df460594524ebedf':
  Clean up CLOEXEC in SocketListener.