Kenny Root 027610a76e resolved conflicts for merge of 964eb438 to master ...

Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e

2010-10-18 13:03:35 -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 964eb438 to master

2010-10-18 13:03:35 -07:00

jni

am 258d0e80: am 0d65a3fc: Merge "Screen on/off animation tweaks" into gingerbread

2010-10-16 08:59:20 -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