Andreas Huber ea427b0c87 resolved conflicts for merge of 26f70db9 to master ...

Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120

2011-11-08 10:40:20 -08:00

..

CameraBrowser

Remove MtpClient class from framework and public API

2011-03-11 10:55:44 -05:00

contents/media_api

Add new open source test contents.

2011-06-15 18:45:54 -07:00

MediaDump

MediaDump: use the MediaPlayer#setSurface method

2011-08-29 14:33:11 -07:00

MediaFrameworkTest

Remove unreliable effect tests.

2011-11-02 18:02:05 -07:00

omxjpegdecoder

am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"

2011-03-14 11:49:56 -07:00

players

resolved conflicts for merge of 26f70db9 to master

2011-11-08 10:40:20 -08:00

ScoAudioTest

Add Bluetooth SCO test app

2011-08-11 10:42:17 -07:00

SoundPoolTest

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00