Grace Kloba f6d1a5528e resolved conflicts for merge of b8802b21 to master

2009-08-03 10:49:58 -07:00

..

http

resolved conflicts for merge of b8802b21 to master

2009-08-03 10:49:58 -07:00

ConnectivityManager.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08: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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08: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

Revert "ConnectivityManager: Add support for bringing up the default APN."

2009-06-30 14:02:27 -04:00

NetworkConnectivityListener.java

auto import from //depot/cupcake/@135843

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

NetworkInfo.aidl

auto import from //depot/cupcake/@135843

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

NetworkInfo.java

AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants

2009-04-13 18:12:47 -07:00

NetworkStateTracker.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08: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

Remove references to android.util.Config

2009-04-09 15:18:48 -07:00

SntpClient.java

auto import from //depot/cupcake/@135843

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

SSLCertificateSocketFactory.java

auto import from //depot/cupcake/@135843

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

Uri.aidl

auto import from //depot/cupcake/@135843

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

Uri.java

am 2d791055: Merge change 6820 into donut

2009-07-12 06:06:31 -07:00

UrlQuerySanitizer.java

auto import from //depot/cupcake/@135843

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

WebAddress.java

Add '_' to the allowable characters in a host name.

2009-04-27 16:33:36 -04:00