OSDN Git Service

Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am: cb8ef17b07
authorElliott Hughes <enh@google.com>
Mon, 16 May 2016 22:11:38 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 22:11:38 +0000 (22:11 +0000)
commit1a45fd0315b21192c40a547c5a6c472f8abee4e0
tree620db7de4a1ae6b19541d3bf792d9867a079ed01
parent00bf97308c2e31358c165f1259120ee2945fc152
parent74a4bfb38c94fed77ecdfa0e42a6bd9f75d1feb7
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am: cb8ef17b07
am: 74a4bfb38c

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

Change-Id: Idc4481e0c5a86df8e843dda0854bedd2fe4f93c6