This is as far as we can get fixing the Camera plugin by recovering state
Merge commit and hacking on CordovaWebView
Doing the merge and fixing DroidGap up a bit
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android into CordovaActivity
Move config.xml parsing into its own Config class

Now the parsing happens very early in the bootstrap process, before
loadUrl() is called. This enables a future change to put the start page
in config.xml instead of hardcoding it.
Add configurable start location to config.xml and template

Still possible to hardcode, there's a comment in the template showing
how that can be done.
Added a comment to explain where the start page is getting set.
Fixes CB-2204: if bin/create fails, exit with code 1
CB-2154: navigator.splashscreen.show() broken in Phonegap 2.2 and 2.3.0rc2

Fixed the splashscreen so it will show for a minimum of 3 seconds if the user has not called loadUrl with a timeout in their main activity.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android