Jeff Brown 46bfd4a355 resolved conflicts for merge of c608e106 to master ...

Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8

2011-01-30 12:50:09 -08:00

..

audioflinger

am 4eeb1047: Merge 13212f83 from gingerbread-plus-aosp

2011-01-29 08:57:47 -08:00

camera

…

input

Fix build.

2011-01-25 18:52:34 -08:00

java

resolved conflicts for merge of c608e106 to master

2011-01-30 12:50:09 -08:00

jni

New APIs for USB host support:

2011-01-22 15:56:09 -08:00

sensorservice

fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly

2011-01-19 18:20:06 -08:00

surfaceflinger

am 8d778b37: am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb

2011-01-28 18:43:08 -08:00

tests/servicestests

…