commit 33f97d8304ab8c78f42f49df368630e385ddcebc
author Vinit Deshpande <vinitd@google.com> Wed Nov 19 22:21:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 19 22:21:38 2014 +0000
tree f84617513594474bba4b581062728e9c16bf80b8
parent 96555a00f85dd620ab2e0fd04e733cc60fcd3a12
parent 77fe4c96b75550e5d22a294314b05beabd55e97a

am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev

* commit '77fe4c96b75550e5d22a294314b05beabd55e97a':
  Fix WPS docs for LABEL method

wifi/java/android/net/wifi/WifiManager.java

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 6559287..9ceb421 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1990,7 +1990,7 @@
     /**
      * Start Wi-fi Protected Setup
      *
-     * @param config WPS configuration
+     * @param config WPS configuration (does not support {@link WpsInfo#LABEL})
      * @param listener for callbacks on success or failure. Can be null.
      * @throws IllegalStateException if the WifiManager instance needs to be
      * initialized again