Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6ebf375 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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

Change-Id: Ic78042d45085718b2220107e9a84767df316440a
parents c6154624 bc905021

core/jni/android_net_NetUtils.cpp

+1 −4
Original line number Diff line number Diff line
@@ -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>