Jim Miller a6cce790b2 Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo

2010-04-05 17:16:00 -07:00

..

config

…

java

Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo

2010-04-05 14:56:03 -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

Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo

2010-04-05 17:16:00 -07:00

tests

Merge "More framework tests cleanup." into froyo

2010-04-01 21:45:41 -07:00