Merge "Using different filenames for testRecorderVideo and testRecorderCamera." into froyo