Andreas Huber 68d2f95328 resolved conflicts for merge of 07bacabe to master ...

Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1

2011-12-05 13:31:17 -08:00

..

java/android

am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1

2011-12-02 17:49:31 -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

…

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

am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1

2011-11-29 16:33:02 -08:00

libmediaplayerservice

resolved conflicts for merge of 3d630e86 to master

2011-11-30 09:53:40 -08:00

libstagefright

resolved conflicts for merge of 07bacabe to master

2011-12-05 13:31:17 -08:00

mediaserver

…

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

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