am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8
* commit 'c54a87e302a2a28b16864f71b9db57241d68ca48':
This commit is contained in: