diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-11-19 22:21:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 22:21:38 +0000 |
| commit | 33f97d8304ab8c78f42f49df368630e385ddcebc (patch) | |
| tree | f84617513594474bba4b581062728e9c16bf80b8 /wifi/java/android | |
| parent | 96555a00f85dd620ab2e0fd04e733cc60fcd3a12 (diff) | |
| parent | 77fe4c96b75550e5d22a294314b05beabd55e97a (diff) | |
| download | frameworks_base-33f97d8304ab8c78f42f49df368630e385ddcebc.zip frameworks_base-33f97d8304ab8c78f42f49df368630e385ddcebc.tar.gz frameworks_base-33f97d8304ab8c78f42f49df368630e385ddcebc.tar.bz2 | |
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
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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 |