[Merge] lp:~brendan-donegan/camera-app/location_prompt_disable into lp:camera-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:353
http://jenkins.qa.ubuntu.com/job/camera-app-ci/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/80
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2843
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/429
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3127
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3127/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/264/rebuild

-- 
https://code.launchpad.net/~brendan-donegan/camera-app/location_prompt_disable/+merge/230961
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app.