Gloria Wang 35a4f21bd6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp ...

Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455

2010-11-02 14:02:59 -07:00

..

java/android

am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread

2010-10-13 09:19:28 -07:00

jni

Fix issue 3126094.

2010-10-22 18:08:13 -07: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

am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread

2010-10-15 18:25:14 -07:00

libmediaplayerservice

Include the framework copy of the OpenMAX headers instead of referencing external/opencore.

2010-10-15 13:31:29 -07:00

libstagefright

resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp

2010-11-02 14:02:59 -07:00

mediaserver

move native services under services/

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

tests

Add the mediaplayer release in the test validation. This is to ensure the media player release properly.

2010-10-26 14:36:09 -07:00