Dianne Hackborn 004abb1223 resolved conflicts for merge of 3d7d3690 to master ...

Change-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf

2010-09-03 14:07:25 -07:00

..

audioflinger

am 937056c1: am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into gingerbread

2010-09-02 12:51:11 -07:00

camera

Remove setPreviewDisplay in CameraService::Client::~Client().

2010-08-31 17:18:38 -07:00

java

resolved conflicts for merge of 3d7d3690 to master

2010-09-03 14:07:25 -07:00

jni

am 36f0cb26: am 8d60866e: Input device calibration and capabilities.

2010-08-30 18:29:12 -07:00

sensorservice

Report sensor events to BatteryStats service

2010-07-23 16:55:24 -07:00

surfaceflinger

am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread

2010-08-25 16:40:28 -07:00

tests/servicestests

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00