Dave Burke 2b6449bbbc am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 ...

* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit

2011-12-15 19:27:17 -08:00

..

java/android

Merge "Fix indentation and whitespace"

2011-12-14 17:35:36 -08:00

jni

am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification,

2011-12-02 13:44:10 -08:00

libdrm

Tidy up exception throwing in the media native code.

2011-04-08 17:42:34 -07:00

libeffects

am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1

2011-11-11 11:51:14 -08:00

libmedia

Merge "Fix indentation and whitespace"

2011-12-14 17:35:36 -08:00

libmediaplayerservice

Merge "Fix build error when verbose logging is enabled"

2011-12-15 10:46:14 -08:00

libstagefright

am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1

2011-12-15 19:27:17 -08:00

mediaserver

Delete obsolete includes

2011-12-12 13:40:06 -08:00

mtp

MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE

2011-12-02 15:12:47 -05:00

tests

Merge "Fix audio effect tests"

2011-12-07 16:45:07 -08:00