tree e72677f25d5bd042cd2eaa380a763aba535bf7ba
parent 4587e23aefaed0428872ffcc1c3e67706f7fa8ed
author Wink Saville <wink@google.com> 1377813428 -0700
committer The Android Automerger <android-build@android.com> 1377887043 -0700

Merge commit 'bc6ecbf7' into manualmerge

* commit 'bc6ecbf7':
  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