tree 3a27148608ecd91ac66cb53fb255ec556f404d7f
parent 1d179e1b18493b6673d44989a796257f5770765c
parent c39dd4ef04b0c15828c162288d874ff79da5ff3d
author Erik Kline <ek@google.com> 1519300985 +0000
committer android-build-merger <android-build-merger@google.com> 1519300985 +0000

Merge "Remove HAVE_{BSD,SOLARIS}_NETWORK -only code" am: 4c5731d5f3
am: c39dd4ef04

Change-Id: I470daed791f6e4db6fe8239a0babcfe28c160e41