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

* commit '800bf3ae6e9affb151b3b0b368c4a3dd22bb1fa0': Fix WPS docs for LABEL method
2014-11-19 20:29:56 +00:00
parent 3f4244773d 800bf3ae6e
commit a34f3d30c6
1 changed files with 1 additions and 1 deletions
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1968,7 +1968,7 @@ public class WifiManager {
    /**
     * 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