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

Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43

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

..

android_runtime

move libbinder's header files under includes/binder

2009-05-20 12:55:03 -07:00

binder

add API to Cursor to get column value type

2010-06-02 17:40:41 -07:00

camera

Change camera interface to support multiple cameras.

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

media

Initial checkin for pause and resume control

2010-06-11 13:48:48 -07:00

pim

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

private

Native input dispatch rewrite work in progress.

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

surfaceflinger

allow re-targetting of surfaces

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

tts

Update TTS plugin interface to receive engine configuration data

2010-03-18 11:52:41 -07:00

ui

Native input dispatch rewrite work in progress.

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

utils

Native input dispatch rewrite work in progress.

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