am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings

Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken

* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
  check for webviewcore before reading settings

core/java/android/webkit/WebView.java

@@ -3974,7 +3974,7 @@ public class WebView extends AbsoluteLayout
                 // false for the first parameter
             }
         } else {
-            if (getSettings().getBuiltInZoomControls()
+            if (mWebViewCore != null && getSettings().getBuiltInZoomControls()
                     && !getZoomButtonsController().isVisible()) {
                 /*
                  * The zoom controls come in their own window, so our window