commit | aad33493a2d4cb1b81dfd15f571d0f968df90be7 | [log] [tgz] |
---|---|---|
author | Aaron Huang <huangaaron@google.com> | Tue Mar 02 06:25:34 2021 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 02 06:25:34 2021 +0000 |
tree | 50f51601c8d6551ab8cb3374b14ad5c555be6148 | |
parent | 125200718e05b76fb1d464468d75c263af038f55 [diff] | |
parent | b1bf756c8c9df0d2f0d7f101fabe6875ec2d9347 [diff] |
Merge "Use the net-utils-device-common version of HexDump"
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;