Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/bb9615ee Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/bb9615ee Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/bb9615ee Branch: refs/heads/master Commit: bb9615eed07af7319667f6488a31107a1ca6fbbb Parents: 18877bf 778b784 Author: Joe Bowser <bows...@apache.org> Authored: Thu Apr 4 16:06:03 2013 -0700 Committer: Joe Bowser <bows...@apache.org> Committed: Thu Apr 4 16:06:03 2013 -0700 ---------------------------------------------------------------------- framework/src/org/apache/cordova/DroidGap.java | 11 +- framework/src/org/apache/cordova/ExposedJsApi.java | 7 + framework/src/org/apache/cordova/InAppBrowser.java | 157 ++++++++++++--- 3 files changed, 147 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
