Narayan Kamath b808af7daf Merge "Allow data uris to be data sources"

2011-12-07 04:15:43 -08:00

..

java/android

am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1

2011-12-06 16:59:44 -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

Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1

2011-12-06 12:52:52 -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 2be608f8: am 6db79c35: Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray an

2011-12-06 16:59:45 -08:00