am 6fdf2a17: am 30ddc724: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev

* commit '6fdf2a1709c2006275d148e3156d249dcc27a99c': Don't enforce control permission when preparing consented VPN.
2014-11-25 17:49:39 +00:00
parent f5ca486ba0 30ddc724a0
commit c08f4ac258
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2776,7 +2776,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
    }

    /**
-     * Prepare for a VPN application. This method is used by system-privileged apps.
+     * Prepare for a VPN application.
     * Permissions are checked in Vpn class.
     * @hide
     */