| commit | 2363af9d93b610bba54417bf77079593cc8c3eb5 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 29 14:57:08 2013 -0700 |
| committer | The Android Automerger <android-build@android.com> | Fri Aug 30 11:24:03 2013 -0700 |
| tree | e72677f25d5bd042cd2eaa380a763aba535bf7ba | |
| parent | 4587e23aefaed0428872ffcc1c3e67706f7fa8ed [diff] |
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