commit 7944b7def8b04c3dc0cb8815a8527aba8c91b219
author Mitsuru Oshima <oshima@google.com> Tue Jun 16 16:34:51 2009 -0700
committer Mitsuru Oshima <oshima@google.com> Tue Jun 16 19:21:14 2009 -0700
tree 66194f3a1eba8943e4f5d60e1c6749f0368f9f84
parent 60e095c190496d42327f8ec2ef990c044d15a76f

conflict fix

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 4168dc4..e922679 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -4835,7 +4835,7 @@
             return mUrl == null || mUrl.length() == 0;
         }
 
-        private void loadIn(WebView webView) {
+        public void loadIn(WebView webView) {
             if (mPostData != null) {
                 webView.postUrl(mUrl, mPostData);
             } else {
@@ -4858,12 +4858,13 @@
         String mMimeType;
         String mInlined;
         String mEncoding;
-        
+        @Override
         boolean isEmpty() {
             return mInlined == null || mInlined.length() == 0 || super.isEmpty(); 
         }
 
-        void loadIn(WebView webView) {
+        @Override
+        public void loadIn(WebView webView) {
             webView.loadDataWithBaseURL(null, mInlined, mMimeType, mEncoding, mUrl);
         }
     }