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

2010-04-05 17:33:10 -07:00

..

config

…

java

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

2010-04-05 15:11:02 -07:00

jni

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

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

res

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

2010-04-05 17:33:10 -07:00

tests

Merge "Fix 2566319, don't use package-protected members from Layout in test."

2010-04-02 09:24:02 -07:00