merge heads

This commit is contained in:
Jimmy Shih
2011-10-27 18:59:10 -07:00
parent dfc5d61514
commit d3ad49c4e1
37 changed files with 587 additions and 429 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() {