commit 2fe9130f227b31e3d24987f442c3374f2299d9f5
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 127399ffe03b7d961b45dcb5ade2cb22df2d08f4
parent 9c316f3c6ac785fd27be97a119dfe8f1303a8ed4
parent 2be608f88cd469b40a472551f22a9d40903beede

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.