diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-08-04 11:40:25 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-08-04 11:40:25 -0400 |
| commit | d5f8e3b3d77d0ad24815fb86ddf9eb8eee0f29e1 (patch) | |
| tree | dda23262c8fedd883abb187f369fea84b746c67d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3db689807a1e59ad7e081ac59a474464b5b57dc2 (diff) | |
| parent | f35da8f2e7d7ef29ce7bcc5e93ede5f2b795d7d1 (diff) | |
Resolve merge conflict for '75f1fdec':
GPS Provider Service changes
GPS engine needs to receive network state changes from Android fw.
Added db query for the current APN, also added a new parameter
between JNI / HAL to the new method in AGpsRilInterface struct
for gps engine to receive APN from GPSLocationService
Conflicts:
services/java/com/android/server/location/GpsLocationProvider.java
Change-Id: I33c45027f1571493d3525324f62d199517c4960c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions