Kenny Root ab023301b0 Merge "Don't measure for a secondary caret unless we have one."

2010-04-01 09:01:45 -07:00

..

config

…

java

Merge "Don't measure for a secondary caret unless we have one."

2010-04-01 09:01:45 -07:00

jni

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

2010-03-31 23:33:55 -07:00

res

am d0b5b3cb: am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo

2010-03-31 23:34:16 -07:00

tests

am 3946101c: 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

2010-03-31 23:34:09 -07:00