joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp

Browse source 
am: bdd12ec7b3

* commit 'bdd12ec7b3':
  Make android_net_NetUtils include what it actually uses.

Change-Id: I84a143e1922c7180a0a1926d2cfd87b59bca137d
This commit is contained in:
Elliott Hughes 2016-05-13 16:06:35 +00:00 • committed by android-build-merger
commit daabe978d4
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/jni/android_net_NetUtils.cpp
View file

@ -25,11 +25,8 @@
#include <arpa/inet.h>
#include <net/if.h>
#include <linux/filter.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <linux/if_ether.h>
#include <linux/if_packet.h>
#include <net/if_ether.h>
#include <netinet/ether.h>
#include <netinet/icmp6.h>
#include <netinet/ip.h>
#include <netinet/ip6.h>