am 59e6e796: Merge "Fix Docs breakage"

* commit '59e6e796dae4e3e6436c7c714510155931183990': Fix Docs breakage
2014-05-07 23:45:08 +00:00
parent 6c6fd8ad50 fab0126136
commit 40878bebf5
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1311,7 +1311,7 @@ public class ConnectivityManager {
     *        HTTP proxy.  A {@code null} value will clear the global HTTP proxy.
     *
     * <p>This method requires the call to hold the permission
-     * {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}.
+     * android.Manifest.permission#CONNECTIVITY_INTERNAL.
     */
    public void setGlobalProxy(ProxyInfo p) {
        try {