From 77fb07e9e9c1b0214ce8fa85406938bc6ebc97a8 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 16 Feb 2018 17:21:39 +0900 Subject: [PATCH] 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 --- core/java/android/net/NetworkCapabilities.java | 1 - 1 file changed, 1 deletion(-) 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; -- 2.11.0