commit 77fe4c96b75550e5d22a294314b05beabd55e97a
author Vinit Deshpande <vinitd@google.com> Wed Nov 19 22:13:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 19 22:13:18 2014 +0000
tree 73847d73d9dd52a9d5538ee9a9dc6de1f8c6c2ce
parent 8415672e18cc6666d040435105fc7566ca525af4
parent a34f3d30c6a7a4b8863175f009935c61ace42b4e

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

* commit 'a34f3d30c6a7a4b8863175f009935c61ace42b4e':
  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 1393bce..6ddebde 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1968,7 +1968,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