[Merge] lp:~thomas-voss/location-service/prefer-system-etc-gps-conf-and-fallback-to-etc-gps-conf into lp:location-service

[PS Jenkins bot]

Review: Approve continuous-integration

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/location-service-ci/312/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/219

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/312/rebuild

-- 
https://code.launchpad.net/~thomas-voss/location-service/prefer-system-etc-gps-conf-and-fallback-to-etc-gps-conf/+merge/237754
Your team Ubuntu Phablet Team is subscribed to branch lp:location-service.