Robert Greenwalt c1b3cbe164 resolved conflicts for merge of ea54b760 to master ...

Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8

2011-11-09 09:03:59 -08:00

..

audioflinger

am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1

2011-11-08 16:37:11 +00:00

camera

…

input

Delete dead code.

2011-11-08 20:24:21 -08:00

java

resolved conflicts for merge of ea54b760 to master

2011-11-09 09:03:59 -08:00

jni

…

powermanager

…

sensorservice

am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1

2011-11-05 19:33:18 +00:00

surfaceflinger

Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1

2011-11-07 21:33:53 -08:00

tests/servicestests

…