wait until Simulator process dead before killing ADB (fixes #435)
stop retrieving now-unscriptable nsIDOMGeoGeolocation interface from geolocation component
Merge pull request #437 from mykmelez/issue-435

wait until Simulator process dead before killing ADB (fixes #435)
Merge pull request #438 from mykmelez/geolocation

stop retrieving now-unscriptable nsIDOMGeoGeolocation interface from geolocation component
Merge remote-tracking branch 'upstream/master' into release-3.0pre6