am 259e3384: am 7e90005f: Merge change I705b1d33 into eclair

Merge commit '259e3384face72ea8e30696d7bae492d37d44e8b' into eclair-mr2-plus-aosp

* commit '259e3384face72ea8e30696d7bae492d37d44e8b':
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off