Brad Fitzpatrick b618b2ef87 am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" ...

* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils

2011-03-28 08:26:02 -07:00

..

java/android

Handle OutOfMemoryError when decoding images in ThumbnailUtils

2011-03-28 14:47:55 +02: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

am 2ba92c71: do not merge bug 3370834 Cherrypick from master

2011-01-26 14:05:18 -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

am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread

2011-03-11 14:31:37 -08:00

mediaserver

move native services under services/

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

tests

Remove unnecessary SkImageDecoder_libjpeg.cpp

2011-03-10 17:52:31 +08:00