Mike Lockwood 22f41918fa resolved conflicts for merge of 6327a9fe to master ...

Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64

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

..

audioflinger

am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread

2010-09-30 19:47:21 -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 6327a9fe to master

2010-10-07 13:55:25 -04: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