summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chalard Jean <jchalard@google.com> 2018-02-16 17:21:39 +0900
committer Chalard Jean <jchalard@google.com> 2018-02-16 17:21:39 +0900
commit77fb07e9e9c1b0214ce8fa85406938bc6ebc97a8 (patch)
tree4d9ee1bba169625037d997e8aa6d9cff87ff8e89
parentd35e81d6159f54a3072317082b5fa89f18e8cef5 (diff)
DO NOT MERGE : fix useless import
This was added to avoid a merge conflict at a sensitive time. It can (and should) go. Test: no code change Change-Id: I11d73e2d988ae61a168aa0f1cc7c2c506f509d30
-rw-r--r--core/java/android/net/NetworkCapabilities.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index bc4d9555c9e7..c94ae93a6f3b 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -21,7 +21,6 @@ import android.net.ConnectivityManager.NetworkCallback;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.ArraySet;
-import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.BitUtils;