destradaa 4fbc845b68 Merge "Avoid performing work in the platform when GPS HAL does not support a feature. b/19271554"

2015-04-22 19:17:08 +00:00

..

java/com/android/server

Merge "Avoid performing work in the platform when GPS HAL does not support a feature. b/19271554"

2015-04-22 19:17:08 +00:00

jni

Merge "Avoid performing work in the platform when GPS HAL does not support a feature. b/19271554"

2015-04-22 19:17:08 +00:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00