| commit | 76136de729b2c0fb6c62e1fdffb0cb73229052e7 | [log] [tgz] |
|---|---|---|
| author | Pavel Maltsev <pavelm@google.com> | Fri Mar 02 23:52:18 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 02 23:52:18 2018 +0000 |
| tree | f94e1e1ee0ca95372a0a7913b1a3c684a511a3e1 | |
| parent | e999899287ed4205643b70f8cc58a9e574d51bc1 [diff] | |
| parent | 762a14565bf5a40d5d1a5f67ba3a05068a4ea1b2 [diff] |
Merge "Extend network request to query networks w/o capabilites" am: 762a14565b Change-Id: Id1d86938fa2d5aff4dbf9cde87548d80c76674d9
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 4be01d0..fd37b8c 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java
@@ -22,6 +22,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;