OSDN Git Service

Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds."
authorElliott Hughes <enh@google.com>
Mon, 16 May 2016 22:08:03 +0000 (22:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 22:08:03 +0000 (22:08 +0000)
commit74a4bfb38c94fed77ecdfa0e42a6bd9f75d1feb7
tree799878b840c9a94420e07ccf79167637d4e05be4
parentabaf7f0bb7fabddbb86dbc21960f20e232e4f18f
parentcb8ef17b07db1048777eebd92782edf1ecea1b36
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds."
am: cb8ef17b07

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

Change-Id: Iefd54322ab3333f57111d58506d1035d1dfc6ded