| commit | 7788c61af5927a0fac612ea94d5205eeec2f507f | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 29 14:57:08 2013 -0700 |
| committer | Wink Saville <wink@google.com> | Thu Aug 29 14:57:08 2013 -0700 |
| tree | f2e7664071b52151a9ebf043d08448f36f4698cc | |
| parent | 4b2993123bf9a1c56d0a16b032612834dd418520 [diff] | |
| parent | 270226b0dddcf3ccb9a4c13cd3dd0427ebc7a4aa [diff] |
Merge commit '270226b0' into manualmerge * commit '270226b0': 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