am 1ae7831b: am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting

Merge commit '1ae7831b8a90a9c0c614790027ce88d5fe75cf93' into eclair-mr2-plus-aosp

* commit '1ae7831b8a90a9c0c614790027ce88d5fe75cf93':
  jni: GpsLocationProvider: Check for pending callbacks before waiting