commit 22800a1348babd6a5bd6b7484ef0e06c938658c0
author Jason Monk <jmonk@google.com> Mon May 31 07:16:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 31 07:16:03 2021 +0000
tree b476e58ede441f06447d5ab5ccc2fdfc6db20053
parent 022f74c9d80e00ad3dde772cc4764a8883677fca
parent 9169e33759269f93ef20c71efbacb47136576ecc

Merge "Fix Docs breakage" am: 9169e33759

Original change: undetermined

Change-Id: I13429b00c5508fe6c65f64572cdd2f98f97a761b

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 25708ea..30d7043 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1311,7 +1311,7 @@
      *        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 {