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 and prime." int

* commit '6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
  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 and prime.
This commit is contained in:
Hong Teng
2011-12-06 15:39:37 -08:00
committed by Android Git Automerger

View File

@ -709,7 +709,7 @@ public class VideoEditorPreviewTest extends
blockTillPreviewCompletes.acquire();
final String fileName = mVideoEditor.getPath() + "\test.3gp";
final String fileName = mVideoEditor.getPath() + "/test.3gp";
final int height = MediaProperties.HEIGHT_480;
final int bitrate = MediaProperties.BITRATE_512K;