tree b0692c6915fe1caab48e90679ab5119f2e26339c
parent eb896e1febd57eba541b8760bcd7010457598b85
parent 2db79771b6a92d9db6b670b000990d6a3398364d
author Shishir Agrawal <shishir@google.com> 1420767542 +0000
committer android-build-merger <android-build-merger@google.com> 1420767542 +0000

am bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager.
automerge: 2db7977

* commit '2db79771b6a92d9db6b670b000990d6a3398364d':
  GpsLocationProvider: Read data enabled status from TelephonyManager.