| commit | b1da33969520ada933c297e0524a5c66a7587b27 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Tue Apr 03 14:17:23 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 03 14:17:23 2018 -0700 |
| tree | 7a71b04a685c8628ea1a131228e3932fd1702fa9 | |
| parent | b92479b5b02366dad8e240c8fa11839c2f1a4993 [diff] | |
| parent | 95a39bec9064c5eadbcd5569ca17d97a7343d897 [diff] |
Merge "Support bypassing TLS in the framework" am: aef9956de2 Change-Id: I5b8cc38ec136f10a4e61f7edf7a9b4945b80b595
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 19f0c90..01546b0 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java
@@ -21,6 +21,7 @@ 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;