Brad Fitzpatrick b60c941811 resolved conflicts for merge of f37cbe6b to master ...

Change-Id: I529b17e55b9668f900f685f92e9831e14a82db05

2010-06-10 15:58:22 -07:00

..

java

resolved conflicts for merge of f37cbe6b to master

2010-06-10 15:58:22 -07:00

jni

am 04598b67: GPS: Support for GPS HAL managing its own scheduling

2010-04-15 12:34:01 -07:00

tests/servicestests

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

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