Daniel Sandler 32cd1d5053 resolved conflicts for merge of 31796297 to master ...

Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1

2011-02-07 16:12:16 -05:00

..

audioflinger

Merge "Bug 3366668 Use BinderService template"

2011-02-04 14:00:17 -08:00

camera

…

input

Fix build.

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

java

resolved conflicts for merge of 31796297 to master

2011-02-07 16:12:16 -05:00

jni

New APIs for USB host support:

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

sensorservice

fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep

2011-02-03 14:52:47 -08:00

surfaceflinger

am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb

2011-02-02 16:46:46 -08:00

tests/servicestests

…