am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev
* commit 'a34f3d30c6a7a4b8863175f009935c61ace42b4e':
Fix WPS docs for LABEL method
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