tree d378ffeb4bf00794e95dea10584f3f93507f49d1
parent d49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7
parent 6db79c35c0cb4e26c6aff4a913777fd21069fd3c
author Hong Teng <hongteng@google.com> 1323214777 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323214777 -0800

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.