Wu-cheng Li de8652cbc1 resolved conflicts for merge of 191a25e1 to master ...

Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c

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

..

audioflinger

am 692dfafe: am 880dfe4f: Merge "Fix issue 3007862" into gingerbread

2010-09-24 10:34:28 -07:00

camera

resolved conflicts for merge of 191a25e1 to master

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

java

Allow all apps to call ContentResolver.getType().

2010-09-27 18:05:44 -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

…