Robert Greenwalt 585ac0fc8d resolved conflicts for merge of 4ea54f44 to master ...

Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56

2010-08-27 11:05:11 -07:00

..

IWifiManager.aidl

asynchronous driver commands

2010-08-19 12:23:13 -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

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

asynchronous driver commands

2010-08-19 12:23:13 -07:00

WifiMonitor.java

Split WifiStateMachine from WifiStateTracker

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

WifiNative.java

Revert "- updates NetUtils to use new libnetutils headers"

2010-08-18 11:16:42 -07:00

WifiStateMachine.java

resolved conflicts for merge of 4ea54f44 to master

2010-08-27 11:05:11 -07:00

WifiStateTracker.java

resolved conflicts for merge of 34df5ccc to master

2010-08-20 06:18:50 -07:00