--- ./mobile/android/base/android-services.mozbuild.orig	2015-07-16 12:27:52.808996807 -0500
+++ ./mobile/android/base/android-services.mozbuild	2015-07-16 12:28:32.980996043 -0500
@@ -870,8 +870,8 @@
     'fxa/authenticator/FxAccountLoginDelegate.java',
     'fxa/authenticator/FxAccountLoginException.java',
     'fxa/authenticator/FxADefaultLoginStateMachineDelegate.java',
-    'fxa/FirefoxAccounts.java',
     'fxa/FxAccountConstants.java',
+    'fxa/FirefoxAccounts.java',
     'fxa/login/BaseRequestDelegate.java',
     'fxa/login/Cohabiting.java',
     'fxa/login/Doghouse.java',
@@ -1024,8 +1024,8 @@
     'sync/repositories/android/CachedSQLiteOpenHelper.java',
     'sync/repositories/android/ClientsDatabase.java',
     'sync/repositories/android/ClientsDatabaseAccessor.java',
-    'sync/repositories/android/FennecTabsRepository.java',
     'sync/repositories/android/FormHistoryRepositorySession.java',
+    'sync/repositories/android/FennecTabsRepository.java',
     'sync/repositories/android/PasswordsRepositorySession.java',
     'sync/repositories/android/RepoUtils.java',
     'sync/repositories/BookmarkNeedsReparentingException.java',
@@ -1117,11 +1117,11 @@
     'sync/stage/CompletedStage.java',
     'sync/stage/EnsureClusterURLStage.java',
     'sync/stage/EnsureCrypto5KeysStage.java',
-    'sync/stage/FennecTabsServerSyncStage.java',
     'sync/stage/FetchInfoCollectionsStage.java',
     'sync/stage/FetchMetaGlobalStage.java',
     'sync/stage/FormHistoryServerSyncStage.java',
     'sync/stage/GlobalSyncStage.java',
+    'sync/stage/FennecTabsServerSyncStage.java',
     'sync/stage/NoSuchStageException.java',
     'sync/stage/NoSyncIDException.java',
     'sync/stage/PasswordsServerSyncStage.java',