Dianne Hackborn dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master ...

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e

2010-09-30 20:34:34 -07: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 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

jni

Drag/drop APIs and infrastructure

2010-09-30 16:29:07 -07:00

sensorservice

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

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

surfaceflinger

am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread

2010-09-24 18:13:22 -07:00

tests/servicestests

Add new system service CountryDetector

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