--- a/mobile/android/base/java/org/mozilla/gecko/db/HomeProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/HomeProvider.java
@@ -79,17 +79,17 @@ public class HomeProvider extends SQLite
 
         final String datasetId = uri.getQueryParameter(BrowserContract.PARAM_DATASET_ID);
         if (datasetId == null) {
             throw new IllegalArgumentException("All queries should contain a dataset ID parameter");
         }
 
         selection = DatabaseUtils.concatenateWhere(selection, HomeItems.DATASET_ID + " = ?");
         selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-							  new String[] { datasetId });
+                                                          new String[] { datasetId });
 
         // Otherwise, let the SQLiteContentProvider implementation take care of this query for us!
         Cursor c = super.query(uri, projection, selection, selectionArgs, sortOrder);
 
         // SQLiteBridgeContentProvider may return a null Cursor if the database hasn't been created yet.
         // However, we need a non-null cursor in order to listen for notifications.
         if (c == null) {
             c = new MatrixCursor(projection != null ? projection : HomeItems.DEFAULT_PROJECTION);

--- a/mobile/android/base/java/org/mozilla/gecko/db/LoginsProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/LoginsProvider.java
@@ -155,17 +155,17 @@ public class LoginsProvider extends Shar
         final SQLiteDatabase db = getWritableDatabase(uri);
 
         beginWrite(db);
         switch (match) {
             case LOGINS_ID:
                 trace("Delete on LOGINS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_LOGINS, Logins._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[]{Long.toString(ContentUris.parseId(uri))});
+                                                                  new String[]{Long.toString(ContentUris.parseId(uri))});
                 // Store the deleted client in deleted-logins table.
                 final String guid = getLoginGUIDByID(selection, selectionArgs, db);
                 if (guid == null) {
                     // No matching logins found for the id.
                     return 0;
                 }
                 boolean isInsertSuccessful = storeDeletedLoginForGUIDInTransaction(guid, db);
                 if (!isInsertSuccessful) {
@@ -177,28 +177,28 @@ public class LoginsProvider extends Shar
                 trace("Delete on LOGINS: " + uri);
                 table = TABLE_LOGINS;
                 break;
 
             case DELETED_LOGINS_ID:
                 trace("Delete on DELETED_LOGINS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_DELETED_LOGINS, DeletedLogins._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[]{Long.toString(ContentUris.parseId(uri))});
+                                                                  new String[]{Long.toString(ContentUris.parseId(uri))});
             // fall through
             case DELETED_LOGINS:
                 trace("Delete on DELETED_LOGINS_ID: " + uri);
                 table = TABLE_DELETED_LOGINS;
                 break;
 
             case DISABLED_HOSTS_HOSTNAME:
                 trace("Delete on DISABLED_HOSTS_HOSTNAME: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_DISABLED_HOSTS, LoginsDisabledHosts.HOSTNAME));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[]{uri.getLastPathSegment()});
+                                                                  new String[]{uri.getLastPathSegment()});
             // fall through
             case DISABLED_HOSTS:
                 trace("Delete on DISABLED_HOSTS: " + uri);
                 table = TABLE_DISABLED_HOSTS;
                 break;
 
             default:
                 throw new UnsupportedOperationException("Unknown delete URI " + uri);
@@ -218,17 +218,17 @@ public class LoginsProvider extends Shar
         final String table;
 
         beginWrite(db);
         switch (match) {
             case LOGINS_ID:
                 trace("Update on LOGINS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_LOGINS, Logins._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[]{Long.toString(ContentUris.parseId(uri))});
+                                                                  new String[]{Long.toString(ContentUris.parseId(uri))});
 
             case LOGINS:
                 trace("Update on LOGINS: " + uri);
                 table = TABLE_LOGINS;
                 // Encrypt sensitive data.
                 encryptContentValueFields(values);
                 break;
 
@@ -252,17 +252,17 @@ public class LoginsProvider extends Shar
         final SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
         final String limit = uri.getQueryParameter(BrowserContract.PARAM_LIMIT);
 
         switch (match) {
             case LOGINS_ID:
                 trace("Query is on LOGINS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_LOGINS, Logins._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { Long.toString(ContentUris.parseId(uri)) });
+                                                                  new String[] { Long.toString(ContentUris.parseId(uri)) });
 
             // fall through
             case LOGINS:
                 trace("Query is on LOGINS: " + uri);
                 if (TextUtils.isEmpty(sortOrder)) {
                     sortOrder = DEFAULT_LOGINS_SORT_ORDER;
                 } else {
                     debug("Using sort order " + sortOrder + ".");
@@ -271,17 +271,17 @@ public class LoginsProvider extends Shar
                 qb.setProjectionMap(LOGIN_PROJECTION_MAP);
                 qb.setTables(TABLE_LOGINS);
                 break;
 
             case DELETED_LOGINS_ID:
                 trace("Query is on DELETED_LOGINS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_DELETED_LOGINS, DeletedLogins._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { Long.toString(ContentUris.parseId(uri)) });
+                                                                  new String[] { Long.toString(ContentUris.parseId(uri)) });
 
             // fall through
             case DELETED_LOGINS:
                 trace("Query is on DELETED_LOGINS: " + uri);
                 if (TextUtils.isEmpty(sortOrder)) {
                     sortOrder = DEFAULT_DELETED_LOGINS_SORT_ORDER;
                 } else {
                     debug("Using sort order " + sortOrder + ".");
@@ -290,17 +290,17 @@ public class LoginsProvider extends Shar
                 qb.setProjectionMap(DELETED_LOGIN_PROJECTION_MAP);
                 qb.setTables(TABLE_DELETED_LOGINS);
                 break;
 
             case DISABLED_HOSTS_HOSTNAME:
                 trace("Query is on DISABLED_HOSTS_HOSTNAME: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_DISABLED_HOSTS, LoginsDisabledHosts.HOSTNAME));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { uri.getLastPathSegment() });
+                                                                  new String[] { uri.getLastPathSegment() });
 
             // fall through
             case DISABLED_HOSTS:
                 trace("Query is on DISABLED_HOSTS: " + uri);
                 if (TextUtils.isEmpty(sortOrder)) {
                     sortOrder = DEFAULT_DISABLED_HOSTS_SORT_ORDER;
                 } else {
                     debug("Using sort order " + sortOrder + ".");

--- a/mobile/android/base/java/org/mozilla/gecko/db/TabsProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/TabsProvider.java
@@ -159,28 +159,28 @@ public class TabsProvider extends Shared
         final int match = URI_MATCHER.match(uri);
         int deleted = 0;
 
         switch (match) {
             case CLIENTS_ID:
                 trace("Delete on CLIENTS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_CLIENTS, Clients._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { Long.toString(ContentUris.parseId(uri)) });
+                                                                  new String[] { Long.toString(ContentUris.parseId(uri)) });
                 // fall through
             case CLIENTS:
                 trace("Delete on CLIENTS: " + uri);
                 deleted = deleteValues(uri, selection, selectionArgs, TABLE_CLIENTS);
                 break;
 
             case TABS_ID:
                 trace("Delete on TABS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_TABS, Tabs._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { Long.toString(ContentUris.parseId(uri)) });
+                                                                  new String[] { Long.toString(ContentUris.parseId(uri)) });
                 // fall through
             case TABS:
                 trace("Deleting on TABS: " + uri);
                 deleted = deleteValues(uri, selection, selectionArgs, TABLE_TABS);
                 break;
 
             default:
                 throw new UnsupportedOperationException("Unknown delete URI " + uri);
@@ -231,28 +231,28 @@ public class TabsProvider extends Shared
         int match = URI_MATCHER.match(uri);
         int updated = 0;
 
         switch (match) {
             case CLIENTS_ID:
                 trace("Update on CLIENTS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_CLIENTS, Clients._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { Long.toString(ContentUris.parseId(uri)) });
+                                                                  new String[] { Long.toString(ContentUris.parseId(uri)) });
                 // fall through
             case CLIENTS:
                 trace("Update on CLIENTS: " + uri);
                 updated = updateValues(uri, values, selection, selectionArgs, TABLE_CLIENTS);
                 break;
 
             case TABS_ID:
                 trace("Update on TABS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_TABS, Tabs._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { Long.toString(ContentUris.parseId(uri)) });
+                                                                  new String[] { Long.toString(ContentUris.parseId(uri)) });
                 // fall through
             case TABS:
                 trace("Update on TABS: " + uri);
                 updated = updateValues(uri, values, selection, selectionArgs, TABLE_TABS);
                 break;
 
             default:
                 throw new UnsupportedOperationException("Unknown update URI " + uri);
@@ -274,17 +274,17 @@ public class TabsProvider extends Shared
         SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
         String limit = uri.getQueryParameter(BrowserContract.PARAM_LIMIT);
 
         switch (match) {
             case TABS_ID:
                 trace("Query is on TABS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_TABS, Tabs._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { Long.toString(ContentUris.parseId(uri)) });
+                                                                  new String[] { Long.toString(ContentUris.parseId(uri)) });
                 // fall through
             case TABS:
                 trace("Query is on TABS: " + uri);
                 if (TextUtils.isEmpty(sortOrder)) {
                     sortOrder = DEFAULT_TABS_SORT_ORDER;
                 } else {
                     debug("Using sort order " + sortOrder + ".");
                 }
@@ -295,17 +295,17 @@ public class TabsProvider extends Shared
                 // 2nd OR clause is because the local client GUID is NULL and we can't assume that SQLite will compare NULL values with the equal operator
                 // More info here: http://stackoverflow.com/questions/5423751/how-do-the-sql-is-and-operators-differ/5424558#5424558
                 break;
 
             case CLIENTS_ID:
                 trace("Query is on CLIENTS_ID: " + uri);
                 selection = DatabaseUtils.concatenateWhere(selection, selectColumn(TABLE_CLIENTS, Clients._ID));
                 selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-								  new String[] { Long.toString(ContentUris.parseId(uri)) });
+                                                                  new String[] { Long.toString(ContentUris.parseId(uri)) });
                 // fall through
             case CLIENTS:
                 trace("Query is on CLIENTS: " + uri);
                 if (TextUtils.isEmpty(sortOrder)) {
                     sortOrder = DEFAULT_CLIENTS_SORT_ORDER;
                 } else {
                     debug("Using sort order " + sortOrder + ".");
                 }