Brad Fitzpatrick 7f7ce40f90 resolved conflicts for merge of 28130bae to master ...

Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a

2010-08-27 16:11:27 -07:00

..

audioflinger

am 3a899b85: am 0b9a12bf: Merge "Fix issue 2929440" into gingerbread

2010-08-21 09:40:43 -07:00

camera

Add the setPreviewWindow camera HAL API to the camera stub.

2010-08-23 17:25:55 -07:00

java

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -07:00

jni

am 36beeca4: am 3d8c9bdb: Raise motion event throttle to 60Hz from 35Hz.

2010-08-21 09:35:28 -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