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

Commit 146b9dca authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

resolve merge conflicts of bc905021 to nyc-dev-plus-aosp am: f6ebf375 

am: 32ec698d

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

Change-Id: I775c03ba7fd3895c6525d3986b564b228d34063b
parents e4fde84e 32ec698d

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>