Merge "Revert "Move module utils to the module package.""

This commit is contained in:
TreeHugger Robot
2020-10-02 03:54:37 +00:00
committed by Android (Google) Code Review

View File

@@ -25,6 +25,7 @@ import static android.system.OsConstants.SOCK_NONBLOCK;
import static android.system.OsConstants.SOCK_RAW;
import android.net.util.InterfaceParams;
import android.net.util.PacketReader;
import android.net.util.SocketUtils;
import android.net.util.TetheringUtils;
import android.os.Handler;
@@ -32,8 +33,6 @@ import android.system.ErrnoException;
import android.system.Os;
import android.util.Log;
import com.android.net.module.util.PacketReader;
import java.io.FileDescriptor;
import java.io.IOException;
import java.net.Inet6Address;