Brad Fitzpatrick 5fdc0c7397 resolved conflicts for merge of 14d151bf to master ...

Change-Id: Ib1ac9acfd6dc71b5fa4e1456a056d1e9dee65fda

2010-10-12 13:12:18 -07:00

..

audioflinger

am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread

2010-10-07 12:23:39 -07:00

camera

Fix camera display orientation.

2010-10-12 15:52:44 +08:00

java

resolved conflicts for merge of 14d151bf to master

2010-10-12 13:12:18 -07:00

jni

am 431dd3b1: am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread

2010-10-12 11:50:23 -07:00

sensorservice

…

surfaceflinger

Always create OpenGL accelerated windows in RGBA 8888.

2010-10-12 11:00:18 -07:00

tests/servicestests

…