Jean-Baptiste Queru 2338f48ddb resolved conflicts for merge of 34df5ccc to master ...

Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98

2010-08-20 06:18:50 -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

Fix the incorrect field name in EAP wifi network.

2009-09-22 14:54:19 +08: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

update ssid in WifiInfo

2010-08-19 21:35:25 -07:00

WifiStateTracker.java

resolved conflicts for merge of 34df5ccc to master

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