commit 9709299a10180f33a43e12ae0730bf8fa290ecd3
author Aaron Huang <huangaaron@google.com> Tue Mar 02 19:55:43 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 02 19:55:43 2021 +0000
tree 7c6ed4e3d755d197e74c04745bf3bdbb7722f2d2
parent dca35b322f9cb3b8accd960caa3987577f9e5885
parent 2ba7d87ea772ef137cd4e502256264360b422968

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3152ffcebf8b51e170cbd70e59c2810c4548d1ca

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;