Nick Pelly 4715bd91f5 resolved conflicts for merge of f4c3b7e9 to master ...

Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4

2010-09-29 12:20:51 -07:00

..

audioflinger

am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread

2010-09-28 17:39:54 -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 f4c3b7e9 to master

2010-09-29 12:20:51 -07:00

jni

Add support for transferring touch focus.

2010-09-27 16:10:17 -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