Kenny Root fb4e1e24a9 resolved conflicts for merge of 181bb0ab to master ...

Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf

2010-07-16 09:04:09 -07:00

..

audioflinger

am c74034b6: am 24651682: added BinderService<> template to help creating native binder services

2010-07-14 20:18:50 -07:00

camera

added BinderService<> template to help creating native binder services

2010-07-14 18:43:19 -07:00

java

resolved conflicts for merge of 181bb0ab to master

2010-07-16 09:04:09 -07:00

jni

resolved conflicts for merge of aca672ba to master

2010-07-15 23:47:29 -07:00

surfaceflinger

added BinderService<> template to help creating native binder services

2010-07-14 18:43:19 -07:00

tests/servicestests

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

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