diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-08-10 17:42:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-10 17:42:45 -0700 |
| commit | ac0a0d06c2cf74215a8552250dcb3788b19becf7 (patch) | |
| tree | bc65c0584a1a52b942c9698d4af90027401c256b /core/java | |
| parent | cd1420b03dfc3aba95283d2cd9d47a81e8c49e10 (diff) | |
| parent | d0d85f26cb7287c63adf95bace098bc1af3fe4e8 (diff) | |
Merge "Unhide APIs for user space VPN."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/VpnService.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index 3e1b512695f0..fb5263d9f13d 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java @@ -101,7 +101,6 @@ import java.util.ArrayList; * </service></pre> * * @see Builder - * @hide */ public class VpnService extends Service { |