Jean-Baptiste Queru 9286cfe501 merge 83fdc69e from gingerbread - do not merge ...

Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680

2011-01-14 18:33:51 -08:00

..

java/android

merge 83fdc69e from gingerbread - do not merge

2011-01-14 18:33:51 -08:00

jni

Squash commits of the following patches, cherry-picked from other branch - do not merge.

2011-01-12 17:12:46 -08:00

libdrm

Merge "Modified libdrm to support SuperH platform"

2010-05-14 19:36:40 -07:00

libeffects

Fix off-by-two and other bugs in the visualization code.

2010-10-27 10:23:59 -07:00

libmedia

merge 83fdc69e from gingerbread - do not merge

2011-01-14 18:33:51 -08:00

libmediaplayerservice

Squash commits of the following patches, cherry-picked from other branch - do not merge.

2011-01-12 17:12:46 -08:00

libstagefright

merge 83fdc69e from gingerbread - do not merge

2011-01-14 18:33:51 -08:00

mediaserver

move native services under services/

2010-07-22 15:28:19 -07:00

tests

Squash commits of the following patches, cherry-picked from other branch - do not merge.

2011-01-12 17:12:46 -08:00