Mathias Agopian 03a9a3449a Merge commit 'goog/master' into merge_master

2009-07-06 14:16:55 -07:00

..

java/android

am ef1f21b3: Merge change 6231 into donut

2009-07-06 12:00:12 -07:00

jni

am 3d7b8d1a: Merge change 5158 into donut

2009-06-24 13:54:09 -07:00

libdrm

AI 143430: Remove broken and unused code.

2009-03-28 21:53:49 -07:00

libmedia

Direct api to the native media player.

2009-06-24 08:22:52 -07:00

libmediaplayerservice

Merge commit 'goog/master' into merge_master

2009-07-01 18:33:18 -07:00

mediaserver

move libbinder's header files under includes/binder

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

sdutils

move libbinder's header files under includes/binder

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

tests/MediaFrameworkTest

am 2f8d58b7: Merge change 5420 into donut

2009-07-01 14:18:45 -07:00