diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-08-18 13:36:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 13:36:01 -0700 |
| commit | aea40e3c5746d754f96b76b7845bbbf7effe2677 (patch) | |
| tree | f6c5218bed720edd29c3a614e0674fb093d20d9f /wifi | |
| parent | a7bb3ba54aed70919c8304ae4227ab5106243f75 (diff) | |
| parent | a1af0d7c80a0119630926810644e6cdee481ba80 (diff) | |
| download | frameworks_base-aea40e3c5746d754f96b76b7845bbbf7effe2677.zip frameworks_base-aea40e3c5746d754f96b76b7845bbbf7effe2677.tar.gz frameworks_base-aea40e3c5746d754f96b76b7845bbbf7effe2677.tar.bz2 | |
am a1af0d7c: Merge "Fix SDK build" into gingerbread
Merge commit 'a1af0d7c80a0119630926810644e6cdee481ba80' into gingerbread-plus-aosp
* commit 'a1af0d7c80a0119630926810644e6cdee481ba80':
Fix SDK build
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 3b41dc1..9d21521 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1004,8 +1004,8 @@ public class WifiManager { * Creates a new WifiLock. * * @param lockType the type of lock to create. See {@link #WIFI_MODE_FULL}, - * {@link #WIFI_MODE_SCAN_ONLY} and {@link #WIFI_MODE_FULL_HIGH_PERF} for descriptions - * of the types of Wi-Fi locks. + * and {@link #WIFI_MODE_SCAN_ONLY} for descriptions of the types of Wi-Fi locks. + * * @param tag a tag for the WifiLock to identify it in debugging messages. This string is * never shown to the user under normal conditions, but should be descriptive * enough to identify your application and the specific WifiLock within it, if it |