Dianne Hackborn 03f3cb083d resolved conflicts for merge of 1f377298 to master ...

Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4

2010-09-17 23:12:26 -07:00

..

IWifiManager.aidl

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ScanResult.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ScanResult.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SupplicantState.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

WifiConfigStore.java

Add per network static IP settings

2010-09-14 16:15:22 -07:00

WifiConfiguration.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

WifiConfiguration.java

Add per network static IP settings

2010-09-14 16:15:22 -07:00

WifiInfo.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

WifiInfo.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

WifiManager.java

Add LinkCapabilities

2010-09-16 21:26:59 -07:00

WifiMonitor.java

Split WifiStateMachine from WifiStateTracker

2010-08-10 15:18:25 -07:00

WifiNative.java

Add set/get band in WifiNative

2010-09-02 12:48:20 -07:00

WifiStateMachine.java

resolved conflicts for merge of 1f377298 to master

2010-09-17 23:12:26 -07:00

WifiStateTracker.java

am 58e0eefe: Improve power tracking of WIFI use.

2010-09-17 15:20:10 -07:00