Bug 868440 - Change the text for GPS r=arthurcc
Merge branch 'master' of https://github.com/mozilla-b2g/gaia