merge branches

This commit is contained in:
Jimmy Shih
2013-02-19 13:31:15 -08:00
parent 13ed536065
commit c4fd180f40
14 changed files with 113 additions and 91 deletions
@@ -76,7 +76,7 @@ public class SendDriveAsyncTask extends AbstractSendAsyncTask {
return false;
}
Drive drive = SyncUtils.getDriveService(credential);
String folderId = SyncUtils.getMyTracksFolder(context, drive);
String folderId = SyncUtils.getMyTracksFolder(context, drive).getId();
if (folderId == null) {
return false;
}