diff options
| author | 2021-03-02 19:42:02 +0000 | |
|---|---|---|
| committer | 2021-03-02 19:42:02 +0000 | |
| commit | 1409a78ca6da50c0d6fc3479a24f6544eeb94fbc (patch) | |
| tree | 4dc40fd3d0e17a5451664499105b415fa2d15b81 | |
| parent | fed4ec6ff6d832611461cb7c487c8ae3adafb1fa (diff) | |
| parent | 93f749b245e930c78607d30295a364fade6d6825 (diff) | |
Merge "Use the net-utils-device-common version of HexDump" am: 93f749b245
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1085391b5649df72b6664d5cdf1756c5110287dc
| -rw-r--r-- | services/core/java/com/android/server/connectivity/KeepaliveTracker.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java index 34d9ccc15dba..7b20ded19205 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.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; |