Joe Onorato 8a5f10b30d resolved conflicts for merge of f7b79151 to master ...

Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca

2010-06-09 15:07:16 -07:00

..

java

resolved conflicts for merge of f7b79151 to master

2010-06-09 15:07:16 -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