Brad Fitzpatrick 385a753dea resolved conflicts for merge of 368fdba4 to master ...

Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d

2010-10-21 07:39:10 -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

Camera framework change required for 0-memcpy recording

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

java

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07: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

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00