merge heads

This commit is contained in:
Jimmy Shih
2011-10-27 18:13:04 -07:00
22 changed files with 181 additions and 126 deletions
@@ -214,7 +214,7 @@ public class TrackWriterTest extends AndroidTestCase {
mocksControl.verify();
assertFalse(writer.wasSuccess());
assertEquals(R.string.error_operation_cancelled, writer.getErrorMessage());
assertEquals(R.string.error_export_operation_canceled, writer.getErrorMessage());
}
public void testWriteTrack_openFails() {