Jean-Baptiste Queru a6fa26f83f resolved conflicts for merge of 6c9a3004 to master ...

Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95

2010-06-21 11:44:49 -07:00

..

java

resolved conflicts for merge of 6c9a3004 to master

2010-06-21 11:44:49 -07:00

jni

am 42bb545a: am 5c225b16: Even more native input dispatch work in progress.

2010-06-17 13:32:45 -07:00

tests/servicestests

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

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