diff options
| author | Bryce Lee <brycelee@google.com> | 2015-01-08 04:42:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-08 04:42:40 +0000 |
| commit | fa71a7433f8cf2e8ad3543683103435ecfea5a26 (patch) | |
| tree | ee0026f7cfe13e98cdba1e245bb62d0eb2f7049e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 701ee593ec85f794a5f0ddb4a2505e374c412c28 (diff) | |
| parent | 1cad8899be13e5eaefbc8300a832a826870ea7ca (diff) | |
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."
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions