From dcb127c14df0e78644b9dc026da81894689c6fd0 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Fri, 22 Jun 2012 10:37:33 -0700
Subject: [PATCH] Weird merge error didn't account for isBackButtonBound

---
 framework/src/org/apache/cordova/App.java            | 2 +-
 framework/src/org/apache/cordova/CordovaWebView.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java
index 8d0895b0..a9faebb5 100755
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/App.java
@@ -208,7 +208,7 @@ public class App extends Plugin {
      * @return boolean
      */
     public boolean isBackbuttonOverridden() {
-        return this.cordova.isBackButtonBound();
+        return webView.isBackButtonBound();
     }
 
     /**
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index f9edbbe5..aa9e222b 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -771,4 +771,9 @@ public class CordovaWebView extends WebView {
            keyUpCodes.add(keyCode);
        }
     }
+    
+    public boolean isBackButtonBound()
+    {
+        return this.bound;
+    }
 }