Dianne Hackborn 25a98b8e21 resolved conflicts for merge of 7f6c6e8f to master ...

Change-Id: Id9dddb78c51f16ff8c4b60339421c94fde506db2

2010-06-30 15:44:58 -07:00

..

android_runtime

Move MTP JNI code from libandroid_runtime to libmedia_jni

2010-06-30 17:54:10 -04:00

binder

am efcf68aa: am ef8f96a7: Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread

2010-06-23 10:18:18 -07:00

camera

Change camera interface to support multiple cameras.

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

media

Added encoding parameters set up for H263 video encoder

2010-06-29 16:44:19 -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

Implement default key handling for native code.

2010-06-30 10:49:40 -07:00

utils

Fix a bug in sp<> and wp<> which could cause memory corruptions

2010-06-24 21:49:02 -07:00