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

Commit d747ff3d authored Mar 02, 2021 by Aaron Huang Committed by Automerger Merge Worker Mar 02, 2021

Merge "Use the net-utils-device-common version of HexDump" am: 93f749b2 am: 1409a78c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieac67b40ce57391a614bd627ba8d3db931031760

parents 089104cf 1409a78c

services/core/java/com/android/server/connectivity/KeepaliveTracker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,8 +57,8 @@ import android.util.Log;
		import android.util.Pair;

		import com.android.internal.R;
		import com.android.internal.util.HexDump;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.net.module.util.HexDump;
		import com.android.net.module.util.IpUtils;

		import java.io.FileDescriptor;