Eric Laurent bb7684bafa resolved conflicts for merge of ac4a284a to master ...

Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8

2010-09-23 12:22:44 -07:00

..

CameraBrowser

MTP host: Use Java longs for storage and object IDs

2010-09-21 10:41:33 -04:00

MediaFrameworkTest

Fix issue 3022800.

2010-09-23 11:04:03 -07:00

mtp

Try to fix the sim build.

2010-07-27 10:55:26 -04:00

omxjpegdecoder

Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.

2010-06-23 16:40:57 -07:00

players

Squashed commit of the following:

2010-08-23 12:30:24 -07:00

SoundPoolTest

Add SoundPool API to pause and resume all active streams. Bug 2426531.

2010-02-16 16:19:32 -08:00