commit 2ba7d87ea772ef137cd4e502256264360b422968
author Aaron Huang <huangaaron@google.com> Tue Mar 02 19:52:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 02 19:52:05 2021 +0000
tree 50f51601c8d6551ab8cb3374b14ad5c555be6148
parent 24b2a334d0711409cd35b09260755bcd937d1a9d
parent 600550be2fd681956217ddd632837dbf6b9ebdfd

Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065 am: 600550be2f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieac67b40ce57391a614bd627ba8d3db931031760

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

diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
index 34d9ccc..7b20ded 100644
--- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
+++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
@@ -57,8 +57,8 @@
 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;