Jaikumar Ganesh d4afde3d12 am b8fc825d: am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo ...

Merge commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5' into kraken

* commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5':
  Fix crash while turning bluetooth on, due to a race condition.

2010-03-31 23:22:51 -07:00

..

config

…

java

am 8de2cf4c: merge from open-source master

2010-03-31 14:17:32 -07:00

jni

am b8fc825d: am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

2010-03-31 23:22:51 -07:00

res

resolved conflicts for merge of d9ee01a9 to kraken

2010-03-30 23:49:17 -07:00

tests

- changed periodic sync scheduling to just creating pending

2010-03-30 18:31:27 -07:00