Jim Miller bc49b43b57 am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo ...

Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken

* commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31':
  Fix 2325549: Allow up to 4 lines of summary text in Settings

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

..

config

…

java

am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo

2010-04-05 15:03:48 -07:00

jni

Move files internal to LocationManagerService from framework.jar to services.jar

2010-04-04 18:44:05 -04:00

res

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

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

tests

Merge "More framework tests cleanup." into froyo

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