LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
am: ddd7dd8e7f

* commit 'ddd7dd8e7f7d661e4a411f2c9f14f69a86e172a4':
  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
parent f97396b8ad ddd7dd8e7f
commit 13d5a1d648
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>