Jeff Brown eb857f12d6 resolved conflicts for merge of f7adbe10 to master ...

Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7

2010-07-16 10:06:33 -07:00

..

audioflinger

am f16b3f10: am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread

2010-07-16 09:12:40 -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 f7adbe10 to master

2010-07-16 10:06:33 -07:00

jni

resolved conflicts for merge of f7adbe10 to master

2010-07-16 10:06:33 -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