| commit | 7506c131c17ff29550eabb8edfd21b6181bb0808 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Mar 02 12:34:25 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 02 12:34:25 2018 +0000 |
| tree | d4a57e53974b20317231ddabbb5fef8b366b9061 | |
| parent | 03580e0ccdccfb7bc16014f60bdc9fad69f42e76 [diff] | |
| parent | f477aedec5dcbe06236a8cc06e3f45067cb76bce [diff] |
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: f477aedec5 Change-Id: Icd1466c79d2593fcab5bd2e31a1acb3a36a705da
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index d8e1741..ba6bc9b 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;