Dianne Hackborn e746f03c6c resolved conflicts for merge of 53686433 to master ...

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d

2010-09-13 16:56:10 -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 WifiConfigStore to manage networks

2010-08-31 15:41:21 -07:00

WifiConfiguration.aidl

auto import from //depot/cupcake/@135843

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

WifiConfiguration.java

Updated documentation for upcoming fix for @code tags

2010-08-26 14:02:20 -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

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -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

Add set/get band in WifiNative

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

WifiStateTracker.java

Remove unused Intent filter values.

2010-09-01 15:16:56 -07:00