Ariel Gertzenstein 4a207e3e52 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2 ...

automerge: b32831e

* commit 'b32831eebfd3c3ba2b26da18fef6818c12643f9d':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524

2015-01-09 18:03:03 +00:00

..

java/com/android/server

Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2

2015-01-09 18:03:03 +00:00

jni

am 8b2b71f5: am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev

2015-01-07 08:10:11 +00:00

Android.mk

…