tree ee0026f7cfe13e98cdba1e245bb62d0eb2f7049e
parent 701ee593ec85f794a5f0ddb4a2505e374c412c28
parent 1cad8899be13e5eaefbc8300a832a826870ea7ca
author Bryce Lee <brycelee@google.com> 1420692160 +0000
committer android-build-merger <android-build-merger@google.com> 1420692160 +0000

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

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