diff --git a/android/src/main/java/com/google/samples/apps/iosched/sync/FeedbackSyncHelper.java b/android/src/main/java/com/google/samples/apps/iosched/sync/FeedbackSyncHelper.java
index 7785a58..37d6836 100644
--- a/android/src/main/java/com/google/samples/apps/iosched/sync/FeedbackSyncHelper.java
+++ b/android/src/main/java/com/google/samples/apps/iosched/sync/FeedbackSyncHelper.java
@@ -59,7 +59,7 @@
         while (c.moveToNext()) {
             String sessionId = c.getString(c.getColumnIndex(ScheduleContract.Feedback.SESSION_ID));
 
-	        List<String> questions = new ArrayList<String>();
+            List<String> questions = new ArrayList<String>();
             questions.add(c.getString(c.getColumnIndex(ScheduleContract.Feedback.SESSION_RATING)));
             questions.add(c.getString(c.getColumnIndex(ScheduleContract.Feedback.ANSWER_RELEVANCE)));
             questions.add(c.getString(c.getColumnIndex(ScheduleContract.Feedback.ANSWER_CONTENT)));
