commit 95db5df370ebdc600880dcb32b22a005dcf41f7e
author Paul Jensen <pauljensen@google.com> Fri Mar 20 11:27:18 2015 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Fri Mar 20 11:27:18 2015 +0000
tree cededf3f32550d50e336043c776164ae91512728
parent 6879b9138d27ead5df2e407909421ecbfe99b542
parent 46c53b80990b699b38dcd28581045831671264c2

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

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index a7f9c5b..8c8bfab 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -148,9 +148,9 @@
      */
     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;