commit 3717403c8dbc2de1f581f1d4f04477fc45d2be61
author Hong Teng <hongteng@google.com> Tue Dec 06 16:59:45 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 06 16:59:45 2011 -0800
tree a4f7155e7d0e10895947a985fd9e447a72f9a5a0
parent de727eb690d20b28f38fda8ed23426d65e1ecd56
parent 68149c76833395dce65ac476d7406ed9e1c29019

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

* commit '2be608f88cd469b40a472551f22a9d40903beede':
  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.