repo sync 3d67c5688f resolved conflicts for merge of 12eaf9d5 to master ...

Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d

2010-09-03 00:24:26 +08:00

..

audioflinger

am 55e79374: am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread

2010-08-31 15:49:15 -07:00

camera

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

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

java

resolved conflicts for merge of 12eaf9d5 to master

2010-09-03 00:24:26 +08: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