Tom Taylor f0108cda21 resolved conflicts for merge of ad2fa35d to master ...

Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90

2009-12-22 10:11:55 -08:00

..

http

Unbundling work

2009-12-14 09:24:09 -08:00

ConnectivityManager.java

Add net type to mobile for mobile-required traffic

2009-08-12 16:08:25 -07:00

Credentials.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DhcpInfo.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DhcpInfo.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IConnectivityManager.aidl

Add net type to mobile for mobile-required traffic

2009-08-12 16:08:25 -07:00

LocalServerSocket.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocalSocket.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocalSocketAddress.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocalSocketImpl.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MailTo.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MobileDataStateTracker.java

Cleanup ConnectivityServices network configuration

2009-11-30 12:56:02 -08:00

NetworkInfo.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NetworkInfo.java

Fix for multi-apn MMS access.

2009-09-10 18:01:01 -07:00

NetworkStateTracker.java

Reduce the ConnectivityManager logging.

2009-09-30 22:10:41 -07:00

NetworkUtils.java

wifi: Keep the WLAN network interface up whenever wifi is enabled.

2009-07-10 17:24:07 -04:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ParseException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Proxy.java

donut snapshot

2009-05-20 11:28:04 -07:00

SntpClient.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SSLCertificateSocketFactory.java

donut snapshot

2009-08-31 09:17:57 -07:00

TrafficStats.java

Add TrafficStats class to SDK.

2009-12-08 10:50:25 -08:00

Uri.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Uri.java

Speed up Uri.getQueryParameter by allocating less.

2009-10-26 14:46:25 -07:00

UrlQuerySanitizer.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

WebAddress.java

Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896

2009-09-23 18:05:51 -07:00