Dianne Hackborn 36e5f667bc resolved conflicts for merge of 2eb12a47 to master ...

Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99

2010-06-24 16:29:54 -07:00

..

java

resolved conflicts for merge of 2eb12a47 to master

2010-06-24 16:29:54 -07:00

jni

am dae19d7c: am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread

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

tests/servicestests

2744878 com.android.server.AccessibilityManagerServiceTest:testInterrupt is failing

2010-06-07 14:27:39 -07:00