Dianne Hackborn a1b0d6966e resolved conflicts for merge of efa4f7f8 to master ...

Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d

2010-10-08 11:09:38 -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

resolved conflicts for merge of 191a25e1 to master

2010-09-27 20:50:22 -07:00

java

resolved conflicts for merge of efa4f7f8 to master

2010-10-08 11:09:38 -07:00

jni

resolved conflicts for merge of 6327a9fe to master

2010-10-07 13:55:25 -04:00

sensorservice

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

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

surfaceflinger

am 19058877: Merge "refactored screenshot code" into gingerbread

2010-10-04 20:06:51 -07:00

tests/servicestests

Add new system service CountryDetector

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