| commit | c3fb781d745cf2f61f0fdcbe35e84c82c46a7e57 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Wed Apr 04 12:43:36 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 04 12:43:36 2018 -0700 |
| tree | 1c3c9152aaab67dbd565443556c86e4bb131e9f4 | |
| parent | b1da33969520ada933c297e0524a5c66a7587b27 [diff] | |
| parent | b5615519e0bda34c4103ebf45c42d14eb9c1bb2b [diff] |
Merge "Force creation of Socket upon Transform application" am: b5615519e0 Change-Id: Ia19da86a3fa40e309ff7a079307a8a63de8ba796
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;