commit 74c5a874a148c4d80354b6c88a8151374aa25b62
author Mitsuru Oshima <oshima@google.com> Wed Jun 17 15:38:01 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Jun 17 15:38:01 2009 -0700
tree d25d344862bd63eb389b3639151a16127283bcc3
parent ec7eb37292836652e096b5804877e803e2505136
parent 7944b7def8b04c3dc0cb8815a8527aba8c91b219

am 7944b7de: conflict fix

Merge commit '7944b7def8b04c3dc0cb8815a8527aba8c91b219'

* commit '7944b7def8b04c3dc0cb8815a8527aba8c91b219':
  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 9832259..7d2ec61 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -5013,7 +5013,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 {
@@ -5036,12 +5036,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);
         }
     }