Dianne Hackborn 03f3cb083d resolved conflicts for merge of 1f377298 to master ...

Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4

2010-09-17 23:12:26 -07:00

..

audioflinger

am 4d987850: am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread

2010-09-13 14:42:59 -07:00

camera

Added command type to play recording sound.

2010-09-14 16:49:08 -07:00

java

resolved conflicts for merge of 1f377298 to master

2010-09-17 23:12:26 -07:00

jni

am 6f0ff46c: am 9c258710: Merge "Fix app switch latency optimization." into gingerbread

2010-09-16 17:29:46 -07:00

sensorservice

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

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

surfaceflinger

Merge "Fix a SurfaceFlinger bug."

2010-09-17 14:07:13 -07:00

tests/servicestests

…