Xia Wang 3946101cc6 am c2eb4094: am de1b1872: 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 ...

Merge commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9' into kraken

* commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9':
  Test connecitvity manager functionality in state change.

2010-03-31 23:23:06 -07:00

..

config

…

java

am 5af7ef60: am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo

2010-03-31 23:23:02 -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

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