| commit | 3ade48710d3b968af12cc8a49b7b5fa87aa36032 | [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 | e72677f25d5bd042cd2eaa380a763aba535bf7ba | |
| parent | 090e8f5ae20727771150cd6aa5e04194d08ab226 [diff] | |
| parent | bc6ecbf7c259dd16d7b7fce794a32dc4c362a926 [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