Eric Laurent 240677ec68 resolved conflicts for merge of dd206093 to master ...

Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae

2010-07-20 13:37:19 -07:00

..

audioflinger

resolved conflicts for merge of dd206093 to master

2010-07-20 13:37:19 -07:00

camera

added BinderService<> template to help creating native binder services

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

java

Merge "Add support for emulating external storage on devices with no SD card"

2010-07-19 16:09:40 -07:00

jni

am 7b8df313: am 00ba8844: Fix individual pointer id up/down reporting.

2010-07-16 16:25:13 -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