OSDN Git Service

Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am: cb8ef17b07 am: 74a4b...
authorElliott Hughes <enh@google.com>
Mon, 16 May 2016 22:19:24 +0000 (22:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 22:19:24 +0000 (22:19 +0000)
commite2aa1b6db6db49839d176c7643e5fe2a14c2f5c5
tree620db7de4a1ae6b19541d3bf792d9867a079ed01
parent1d8496c584a3f0108474b4c58843e90750bc5f1f
parent1a45fd0315b21192c40a547c5a6c472f8abee4e0
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am: cb8ef17b07 am: 74a4bfb38c
am: 1a45fd0315

* commit '1a45fd0315b21192c40a547c5a6c472f8abee4e0':
  Fix <resolv.h> and <netinet/tcp.h> so dnscap builds.

Change-Id: I5771bf25ceda4a7848eb6fe28e83354ec18c2e50