tree 82cf2be2b99d4a53b616eaf9a1b442a8166e433f
parent 764a1ba86d3160e4b1e10aa1ac7477539321b42b
parent d1646dcfd1d40bdc094f34e05c1359cfc3fa7c65
author Bryce Lee <brycelee@google.com> 1420691881 +0000
committer android-build-merger <android-build-merger@google.com> 1420691881 +0000

Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge: c010c96
automerge: d1646dc

* commit 'd1646dcfd1d40bdc094f34e05c1359cfc3fa7c65':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."