Merge "Add error-check when mapping socket to fd"
authorElliott Hughes <enh@google.com>
Thu, 27 Nov 2014 19:05:13 +0000 (19:05 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 27 Nov 2014 19:05:13 +0000 (19:05 +0000)

Trivial merge