Ben Murdoch 352cf1a45e Merge changes Ic9531e3c,I3f04433b into froyo ...

* changes:
  Cherry pick from master.
  Cherry pick from master.

2010-04-01 08:42:14 -07:00

..

config

…

java

Merge changes Ic9531e3c,I3f04433b into froyo

2010-04-01 08:42:14 -07:00

jni

Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

2010-03-31 18:36:35 -07:00

res

Fix issue #2560791: Expose API to go in to car mode.

2010-03-31 16:25:53 -07:00

tests

Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo

2010-03-31 20:29:10 -07:00