Narayan Kamath 57616d3e55 resolved conflicts for merge of 18e3727f to master ...

Change-Id: I3d74db13f163ac3f23955b6c7d8469e7a8f93066

2014-11-21 11:57:07 +00:00

..

CacheManager.java

…

ClientCertRequest.java

…

ConsoleMessage.java

…

CookieManager.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

CookieSyncManager.java

…

DateSorter.java

…

DownloadListener.java

…

EventLogTags.logtags

…

FindActionModeCallback.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

GeolocationPermissions.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

HttpAuthHandler.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

IWebViewUpdateService.aidl

…

JavascriptInterface.java

…

JsDialogHelper.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

JsPromptResult.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

JsResult.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

MimeTypeMap.java

…

package.html

…

PermissionRequest.java

Address API Feedback

2014-08-27 17:56:08 -07:00

Plugin.java

…

PluginData.java

…

PluginList.java

…

PluginStub.java

…

SslErrorHandler.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

UrlInterceptHandler.java

…

UrlInterceptRegistry.java

…

URLUtil.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

ValueCallback.java

…

WebBackForwardList.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

WebChromeClient.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

WebHistoryItem.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

WebIconDatabase.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

WebResourceRequest.java

Remove an @removed member of andorid.webkit.WebResourceResponse.

2014-09-12 18:24:49 +01:00

WebResourceResponse.java

Disallow passing a StringBufferInputStream to a WebResourceResponse

2014-09-15 20:18:50 +00:00

WebSettings.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

WebStorage.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

WebSyncManager.java

…

WebView.java

am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev

2014-11-13 15:20:29 +00:00

WebViewClient.java

…

WebViewDatabase.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

WebViewDelegate.java

Rename callDrawGLFunction

2014-11-20 14:40:52 -08:00

WebViewFactory.java

Merge "Block loading WebView in privileged processes." into lmp-mr1-dev

2014-11-14 19:24:53 +00:00

WebViewFactoryProvider.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00

WebViewFragment.java

…

WebViewProvider.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-12 22:49:56 +00:00