OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d8496c 1a45fd0)
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)
am: 1a45fd0315

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

Change-Id: I5771bf25ceda4a7848eb6fe28e83354ec18c2e50


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help