| commit | cb117d31cbb0d9c0854475ba45eea1ce9d0522e5 | [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 | c711d7a5e936f760bcd8cdf6afcfbf12020e983e [diff] | |
| parent | a37f06d7d52700e3f50c18d4563ecb9a9f588ff6 [diff] |
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