diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-11-20 22:57:10 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-11-20 22:57:10 +0000 |
| commit | 70949955509754ca83446edf5031aef0df5a4a62 (patch) | |
| tree | c5266221dc23503435ac90d1d89807c36568a80d | |
| parent | 30219730dabe21f43f5fd6a1464165a9192243c1 (diff) | |
| parent | d83e7f767cf5d3fccd1b80599b994c2397131452 (diff) | |
| download | android_frameworks_webview-70949955509754ca83446edf5031aef0df5a4a62.tar.gz android_frameworks_webview-70949955509754ca83446edf5031aef0df5a4a62.tar.bz2 android_frameworks_webview-70949955509754ca83446edf5031aef0df5a4a62.zip | |
resolved conflicts for merge of d83e7f76 to lmp-mr1-dev-plus-aosp
Change-Id: I8d2faecfc87c0be8379d2a6d403f67c6fa8d9cb3
| -rw-r--r-- | nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java b/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java index 2f993cc..f157a95 100644 --- a/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java +++ b/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java @@ -23,12 +23,13 @@ import android.webkit.WebIconDatabase; import android.webkit.WebStorage; import android.webkit.WebView; import android.webkit.WebViewDatabase; +import android.webkit.WebViewDelegate; import android.webkit.WebViewFactoryProvider; import android.webkit.WebViewProvider; public class NullWebViewFactoryProvider implements WebViewFactoryProvider { - public NullWebViewFactoryProvider() { + public NullWebViewFactoryProvider(WebViewDelegate delegate) { } @Override |