Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-plus-aosp * commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f': jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-plus-aosp * commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f': jni: GpsLocationProvider: Check for pending callbacks before waiting