Joe Onorato 749984798c fix bad merge ...

Change-Id: I44b9265a7ef3accc5c794d2ef9308b050c961a81

2010-10-21 11:38:25 -04:00

..

audioflinger

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

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

camera

Camera framework change required for 0-memcpy recording

2010-10-19 23:07:08 -07:00

java

fix bad merge

2010-10-21 11:38:25 -04:00

jni

am 8333d591: am 5d5a9db5: Merge "GPS: Enable some more logging" into gingerbread

2010-10-19 09:55:45 -07:00

sensorservice

Replace epoll() with poll() and rename PollLoop to Looper.

2010-09-14 01:59:45 -07:00

surfaceflinger

am 9f6d18ca: am 04358138: Merge "[3095807] screen takes a long time to turn on" into gingerbread

2010-10-16 08:58:35 -07:00

tests/servicestests

…