Dianne Hackborn c8f8497b9c resolved conflicts for merge of 66d633d2 to master ...

Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586

2010-08-25 23:14:44 -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 66d633d2 to master

2010-08-25 23:14:44 -07:00

jni

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

2010-08-21 09:35:28 -07:00

sensorservice

…

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

…