Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a1af0d7c: Merge "Fix SDK build" into gingerbread

Browse Source 
Merge commit 'a1af0d7c80a0119630926810644e6cdee481ba80' into gingerbread-plus-aosp

* commit 'a1af0d7c80a0119630926810644e6cdee481ba80':
  Fix SDK build
This commit is contained in:
Irfan Sheriff
2010-08-18 13:36:01 -07:00
committed by Android Git Automerger
parent a7bb3ba54a a1af0d7c80
commit aea40e3c57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -1004,8 +1004,8 @@ public class WifiManager {
* Creates a new WifiLock. * Creates a new WifiLock.
* *
* @param lockType the type of lock to create. See {@link #WIFI_MODE_FULL}, * @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 * and {@link #WIFI_MODE_SCAN_ONLY} for descriptions of the types of Wi-Fi locks.
* of the types of Wi-Fi locks. *
* @param tag a tag for the WifiLock to identify it in debugging messages. This string is * @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 * 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 * enough to identify your application and the specific WifiLock within it, if it