Wink Saville 126fee88d4 am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2 ...

Merge commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef' into eclair-mr2-plus-aosp

* commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef':
  Add code to use Gservices provided values for throtting NITZ updates.

2009-11-12 23:08:56 -08:00

..

config

…

java

am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2

2009-11-12 23:08:56 -08:00

jni

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

2009-11-06 06:31:37 -08:00

res

am 58c603ef: Merge change Id301a47f into eclair

2009-11-12 13:17:15 -08:00