Wink Saville cb117d31cb Merge commit 'a37f06d7' into manualmerge ...

* commit 'a37f06d7':
  Add support for handling mobile provisioning networks.

Conflicts:
	core/java/android/net/CaptivePortalTracker.java
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	core/java/android/net/MobileDataStateTracker.java
	core/res/AndroidManifest.xml
	services/java/com/android/server/ConnectivityService.java

Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5

2013-08-29 14:57:08 -07:00

..

java/android/net

Merge commit 'a37f06d7' into manualmerge

2013-08-29 14:57:08 -07:00

jni

Use a single socket to communicate with supplicant

2013-08-08 18:38:53 +00:00

tests/coretests

Modify LinkProperties address update methods.

2013-08-20 21:16:37 +09:00