The Android Open Source Project d3af727927 Merge branch 'readonly-p4-master' ...

Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java

2009-04-02 12:18:20 -07:00

..

gears

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

2009-04-02 11:00:54 -07:00

BrowserFrame.java

auto import from //depot/cupcake/@136594

2009-03-05 14:34:35 -08:00

ByteArrayBuilder.java

auto import from //depot/cupcake/@135843

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

CacheLoader.java

auto import from //depot/cupcake/@135843

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

CacheManager.java

AI 144242: Fix 1750062. When createCacheFile, if we get 303, or redirect with cookies, or "no-store", make sure to remove the existing entry in the cache db before returning null for CachedResult.

2009-04-02 10:55:37 -07:00

CallbackProxy.java

auto import from //branches/cupcake_rel/...@138607

2009-03-13 13:04:22 -07:00

ContentLoader.java

Automated import from //branches/master/...@140426,140426

2009-03-24 17:39:42 -07:00

CookieManager.java

auto import from //branches/cupcake_rel/...@138607

2009-03-13 13:04:22 -07:00

CookieSyncManager.java

auto import from //depot/cupcake/@135843

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

DataLoader.java

auto import from //depot/cupcake/@135843

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

DateSorter.java

auto import from //depot/cupcake/@135843

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

DownloadListener.java

auto import from //depot/cupcake/@135843

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

FileLoader.java

auto import from //depot/cupcake/@135843

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

FrameLoader.java

auto import from //depot/cupcake/@136594

2009-03-05 14:34:35 -08:00

HttpAuthHandler.java

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

HttpDateTime.java

auto import //branches/master/...@140412

2009-03-18 22:20:26 -07:00

JsPromptResult.java

auto import from //depot/cupcake/@135843

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

JsResult.java

auto import from //depot/cupcake/@135843

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

JWebCoreJavaBridge.java

auto import from //depot/cupcake/@135843

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

LoadListener.java

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

MimeTypeMap.java

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

Network.java

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

package.html

auto import from //depot/cupcake/@135843

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

PerfChecker.java

auto import from //depot/cupcake/@135843

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

Plugin.java

auto import from //depot/cupcake/@135843

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

PluginContentLoader.java

auto import from //depot/cupcake/@136594

2009-03-05 14:34:35 -08:00

PluginData.java

auto import from //depot/cupcake/@136594

2009-03-05 14:34:35 -08:00

PluginList.java

auto import from //depot/cupcake/@135843

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

SslErrorHandler.java

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

StreamLoader.java

auto import from //depot/cupcake/@135843

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

TextDialog.java

Automated import from //branches/master/...@142632,142632

2009-03-25 15:15:24 -07:00

UrlInterceptHandler.java

auto import from //depot/cupcake/@136594

2009-03-05 14:34:35 -08:00

UrlInterceptRegistry.java

auto import from //depot/cupcake/@136594

2009-03-05 14:34:35 -08:00

URLUtil.java

auto import from //depot/cupcake/@135843

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

WebBackForwardList.java

auto import from //depot/cupcake/@135843

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

WebChromeClient.java

auto import from //depot/cupcake/@135843

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

WebHistoryItem.java

auto import from //depot/cupcake/@135843

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

WebIconDatabase.java

auto import from //depot/cupcake/@135843

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

WebSettings.java

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07:00

WebSyncManager.java

auto import from //depot/cupcake/@135843

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

WebView.java

Merge branch 'readonly-p4-master'

2009-04-02 10:49:03 -07:00

WebViewClient.java

auto import from //depot/cupcake/@135843

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

WebViewCore.java

AI 144000: am: CL 143999 am: CL 143998 Fix #1750489. Call WebKit's setNetworkOnLine from WebCore thread instead of UI thread as WebKit is not thread safe.

2009-04-02 08:50:17 -07:00

WebViewDatabase.java

auto import from //depot/cupcake/@135843

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