Jeff Brown 8e03b7566c resolved conflicts for merge of 9e660c82 to master ...

Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43

2010-06-13 19:16:55 -07:00

..

audioflinger

am 030a1553: am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken

2010-06-04 00:18:07 -07:00

binder

Move CursorWindow class from core/jni to libbinder

2010-05-28 10:08:21 -04:00

camera

Change camera interface to support multiple cameras.

2010-06-11 16:47:33 +08:00

rs

Remove float8/16 from RS type list.

2010-06-09 14:26:16 -07:00

surfaceflinger

allow re-targetting of surfaces

2010-06-08 20:10:02 -07:00

surfaceflinger_client

allow re-targetting of surfaces

2010-06-08 20:10:02 -07:00

ui

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -07:00

utils

resolved conflicts for merge of 9e660c82 to master

2010-06-13 19:16:55 -07:00