Robert Greenwalt 057d5e9824 Fix the build ...

broken merge resolution.

Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe

2010-09-09 14:05:10 -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

Fix the build

2010-09-09 14:05:10 -07:00

jni

am 8723bb58: am b21fb104: Fix key repeat delay.

2010-09-08 14:38:09 -07:00

sensorservice

Report sensor events to BatteryStats service

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

surfaceflinger

surfaceflinger: give hwcomposer a chance to release buffers

2010-09-09 12:06:48 -07:00

tests/servicestests

Add new system service CountryDetector

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