Merge "Make NetworkCapabilities.NOT_VPN javadoc visible." into m-wireless-dev

2015-03-20 11:27:18 +00:00
parent 8357dfd520 ba9c42f661
commit 703642c635
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -148,9 +148,9 @@ public final class NetworkCapabilities implements Parcelable {
     */
    public static final int NET_CAPABILITY_TRUSTED        = 14;

-    /*
+    /**
     * Indicates that this network is not a VPN.  This capability is set by default and should be
-     * explicitly cleared when creating VPN networks.
+     * explicitly cleared for VPN networks.
     */
    public static final int NET_CAPABILITY_NOT_VPN        = 15;