Dianne Hackborn dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master ...

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e

2010-09-30 20:34:34 -07:00

..

http

…

ConnectivityManager.java

…

Credentials.java

…

DhcpInfo.aidl

…

DhcpInfo.java

…

Downloads.java

…

IConnectivityManager.aidl

…

INetworkManagementEventObserver.aidl

…

InterfaceConfiguration.aidl

…

InterfaceConfiguration.java

…

IThrottleManager.aidl

…

LinkCapabilities.aidl

…

LinkCapabilities.java

…

LinkProperties.aidl

…

LinkProperties.java

…

LinkSocket.java

…

LinkSocketNotifier.java

…

LocalServerSocket.java

…

LocalSocket.java

…

LocalSocketAddress.java

…

LocalSocketImpl.java

…

MailTo.java

…

MobileDataStateTracker.java

…

NetworkInfo.aidl

…

NetworkInfo.java

…

NetworkStateTracker.java

…

NetworkUtils.java

…

package.html

…

ParseException.java

…

Proxy.java

…

ProxyProperties.java

…

SntpClient.java

…

SSLCertificateSocketFactory.java

…

SSLSessionCache.java

…

ThrottleManager.java

…

TrafficStats.java

…

Uri.aidl

…

Uri.java

…

UrlQuerySanitizer.java

…

WebAddress.java

…