summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2011-08-01 14:09:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-01 14:09:58 -0700
commit44dabe3da3a2378815a98c7be1a1148b7714a1e4 (patch)
tree71c46690aed0ae5ffeed5a2b2cefabb2e95b3b2a /core/java
parenta7edc40faae591d749ab12d5d871d58946e7013f (diff)
parente1538f05587386bbba8dac0b4b4a6c1059947429 (diff)
downloadframeworks_base-44dabe3da3a2378815a98c7be1a1148b7714a1e4.zip
frameworks_base-44dabe3da3a2378815a98c7be1a1148b7714a1e4.tar.gz
frameworks_base-44dabe3da3a2378815a98c7be1a1148b7714a1e4.tar.bz2
Merge "Revert "Unhide APIs for user space VPN.""
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/VpnBuilder.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/net/VpnBuilder.java b/core/java/android/net/VpnBuilder.java
index 25cedb6..4582523 100644
--- a/core/java/android/net/VpnBuilder.java
+++ b/core/java/android/net/VpnBuilder.java
@@ -91,6 +91,7 @@ import java.util.ArrayList;
*
* <p class="note">Using this class requires
* {@link android.Manifest.permission#VPN} permission.
+ * @hide
*/
public class VpnBuilder {