[Android Software Development] Deltadroid:
I have included a diff to show the manual changes I have made to classes.dex in SetupWizard.apk due to bugs in oat2dex during the deodex process for marshmallow.

diff -ru SetupWizard_phone-out/android/support/v4/app/LoaderManagerImpl$LoaderInfo.smali SetupWizard_tab-out/android/support/v4/app/LoaderManagerImpl$LoaderInfo.smali
--- SetupWizard_phone-out/android/support/v4/app/LoaderManagerImpl$LoaderInfo.smali	2015-10-06 02:45:51.009432058 +0200
+++ SetupWizard_tab-out/android/support/v4/app/LoaderManagerImpl$LoaderInfo.smali	2015-10-06 02:46:04.045432048 +0200
@@ -3,8 +3,8 @@
.source "LoaderManager.java"

# interfaces
-.implements Landroid/support/v4/content/Loader$OnLoadCanceledListener;
.implements Landroid/support/v4/content/Loader$OnLoadCompleteListener;
+.implements Landroid/support/v4/content/Loader$OnLoadCanceledListener;

# annotations
diff -ru SetupWizard_phone-out/android/support/v4/media/MediaMetadataCompat.smali SetupWizard_tab-out/android/support/v4/media/MediaMetadataCompat.smali
--- SetupWizard_phone-out/android/support/v4/media/MediaMetadataCompat.smali	2015-10-06 02:45:51.069432058 +0200
+++ SetupWizard_tab-out/android/support/v4/media/MediaMetadataCompat.smali	2015-10-06 02:46:04.105432048 +0200
@@ -80,7 +80,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 242
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -91,7 +91,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 243
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -102,7 +102,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 244
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -113,7 +113,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 245
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -124,7 +124,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 246
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -135,7 +135,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 247
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -146,7 +146,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 248
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -157,7 +157,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 249
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -168,7 +168,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 250
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -179,7 +179,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 251
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -190,7 +190,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 252
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -201,7 +201,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 253
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -212,7 +212,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 254
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -223,7 +223,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 255
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -234,7 +234,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 256
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -245,7 +245,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 257
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -256,7 +256,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 258
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -267,7 +267,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 259
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -278,7 +278,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 260
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -289,7 +289,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 261
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -300,7 +300,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 262
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -311,7 +311,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 263
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -322,7 +322,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 264
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -333,7 +333,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 265
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -344,7 +344,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 266
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -355,7 +355,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 267
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -366,7 +366,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 270
const/4 v0, 0x7
diff -ru SetupWizard_phone-out/com/google/android/gms/internal/bu.smali SetupWizard_tab-out/com/google/android/gms/internal/bu.smali
--- SetupWizard_phone-out/com/google/android/gms/internal/bu.smali	2015-10-06 02:45:54.117432056 +0200
+++ SetupWizard_tab-out/com/google/android/gms/internal/bu.smali	2015-10-06 02:46:06.925432046 +0200
@@ -235,9 +235,7 @@

move-object v0, v1

- nop
-
- nop
+ check-cast v0, Ljava/lang/String;

invoke-static {v2, v0}, Lcom/google/android/gms/internal/bu;->b(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/internal/jp;

@@ -273,9 +271,7 @@

move-object v0, v1

- nop
-
- nop
+ check-cast v0, Ljava/lang/String;

invoke-static {v2, v0}, Lcom/google/android/gms/internal/bu;->b(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/internal/jp;

@@ -347,9 +343,7 @@

move-object v0, v1

- nop
-
- nop
+ check-cast v0, Ljava/lang/String;

invoke-static {v2, v0}, Lcom/google/android/gms/internal/bu;->b(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/internal/jp;

@@ -367,9 +361,7 @@

const-string/jumbo v0, "gads:request_builder:singleton_webview_experiment_id"

- nop
-
- nop
+ check-cast v1, Ljava/lang/String;

invoke-static {v0, v1}, Lcom/google/android/gms/internal/bu;->b(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/internal/jp;

diff -ru SetupWizard_phone-out/com/google/android/gms/internal/hh$7.smali SetupWizard_tab-out/com/google/android/gms/internal/hh$7.smali
--- SetupWizard_phone-out/com/google/android/gms/internal/hh$7.smali	2015-10-06 02:45:54.357432056 +0200
+++ SetupWizard_tab-out/com/google/android/gms/internal/hh$7.smali	2015-10-06 02:46:07.121432046 +0200
@@ -37,7 +37,7 @@

sget-object v1, Landroid/webkit/ConsoleMessage$MessageLevel;->ERROR:Landroid/webkit/ConsoleMessage$MessageLevel;

- invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+ invoke-virtual {v1}, Landroid/webkit/ConsoleMessage$MessageLevel;->ordinal()I

move-result v1

@@ -53,7 +53,7 @@

sget-object v1, Landroid/webkit/ConsoleMessage$MessageLevel;->WARNING:Landroid/webkit/ConsoleMessage$MessageLevel;

- invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+ invoke-virtual {v1}, Landroid/webkit/ConsoleMessage$MessageLevel;->ordinal()I

move-result v1

@@ -69,7 +69,7 @@

sget-object v1, Landroid/webkit/ConsoleMessage$MessageLevel;->LOG:Landroid/webkit/ConsoleMessage$MessageLevel;

- invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+ invoke-virtual {v1}, Landroid/webkit/ConsoleMessage$MessageLevel;->ordinal()I

move-result v1

@@ -85,7 +85,7 @@

sget-object v1, Landroid/webkit/ConsoleMessage$MessageLevel;->TIP:Landroid/webkit/ConsoleMessage$MessageLevel;

- invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+ invoke-virtual {v1}, Landroid/webkit/ConsoleMessage$MessageLevel;->ordinal()I

move-result v1

@@ -101,7 +101,7 @@

sget-object v1, Landroid/webkit/ConsoleMessage$MessageLevel;->DEBUG:Landroid/webkit/ConsoleMessage$MessageLevel;

- invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+ invoke-virtual {v1}, Landroid/webkit/ConsoleMessage$MessageLevel;->ordinal()I

move-result v1

diff -ru SetupWizard_phone-out/com/google/android/gms/wearable/internal/m.smali SetupWizard_tab-out/com/google/android/gms/wearable/internal/m.smali
--- SetupWizard_phone-out/com/google/android/gms/wearable/internal/m.smali	2015-10-06 02:45:55.957432055 +0200
+++ SetupWizard_tab-out/com/google/android/gms/wearable/internal/m.smali	2015-10-06 02:46:08.273432045 +0200
@@ -3,8 +3,8 @@
.source "Unknown"

# interfaces
-.implements Lcom/google/android/gms/common/data/Freezable;
.implements Lcom/google/android/gms/common/internal/safeparcel/SafeParcelable;
+.implements Lcom/google/android/gms/common/data/Freezable;

# static fields
diff -ru SetupWizard_phone-out/com/google/android/setupwizard/BaseActivity.smali SetupWizard_tab-out/com/google/android/setupwizard/BaseActivity.smali
--- SetupWizard_phone-out/com/google/android/setupwizard/BaseActivity.smali	2015-10-06 02:45:56.097432055 +0200
+++ SetupWizard_tab-out/com/google/android/setupwizard/BaseActivity.smali	2015-10-06 02:46:08.369432045 +0200
@@ -4,8 +4,8 @@

# interfaces
.implements Lcom/android/setupwizardlib/view/BottomScrollView$BottomScrollListener;
-.implements Lcom/android/setupwizardlib/view/NavigationBar$NavigationBarListener;
.implements Lcom/google/android/setupwizard/util/FourCornersGestureDetector$OnFourCornersListener;
+.implements Lcom/android/setupwizardlib/view/NavigationBar$NavigationBarListener;

# annotations
diff -ru SetupWizard_phone-out/com/google/android/setupwizard/util/CountryHelper.smali SetupWizard_tab-out/com/google/android/setupwizard/util/CountryHelper.smali
--- SetupWizard_phone-out/com/google/android/setupwizard/util/CountryHelper.smali	2015-10-06 02:45:56.393432054 +0200
+++ SetupWizard_tab-out/com/google/android/setupwizard/util/CountryHelper.smali	2015-10-06 02:46:08.661432045 +0200
@@ -33,9 +33,7 @@

const/4 v0, 0x0

- nop
-
- nop
+ check-cast v0, Ljava/lang/String;

invoke-static {v1, v0}, Lcom/google/android/setupwizard/util/GservicesValue;->value(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/setupwizard/util/GservicesValue;

diff -ru SetupWizard_phone-out/com/google/android/setupwizard/util/FloatingLabelLayout.smali SetupWizard_tab-out/com/google/android/setupwizard/util/FloatingLabelLayout.smali
--- SetupWizard_phone-out/com/google/android/setupwizard/util/FloatingLabelLayout.smali	2015-10-06 02:45:56.405432054 +0200
+++ SetupWizard_tab-out/com/google/android/setupwizard/util/FloatingLabelLayout.smali	2015-10-06 02:46:08.673432045 +0200
@@ -3,9 +3,9 @@
.source "FloatingLabelLayout.java"

# interfaces
-.implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
.implements Landroid/text/TextWatcher;
.implements Landroid/view/View$OnFocusChangeListener;
+.implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;

# annotations
diff -ru SetupWizard_phone-out/com/google/android/setupwizard/util/LanguagePicker.smali SetupWizard_tab-out/com/google/android/setupwizard/util/LanguagePicker.smali
--- SetupWizard_phone-out/com/google/android/setupwizard/util/LanguagePicker.smali	2015-10-06 02:45:56.437432054 +0200
+++ SetupWizard_tab-out/com/google/android/setupwizard/util/LanguagePicker.smali	2015-10-06 02:46:08.701432045 +0200
@@ -3,9 +3,9 @@
.source "LanguagePicker.java"

# interfaces
-.implements Landroid/content/DialogInterface$OnDismissListener;
.implements Landroid/view/View$OnClickListener;
.implements Landroid/widget/AdapterView$OnItemClickListener;
+.implements Landroid/content/DialogInterface$OnDismissListener;

# annotations
diff -ru SetupWizard_phone-out/com/google/common/collect/ImmutableMap.smali SetupWizard_tab-out/com/google/common/collect/ImmutableMap.smali
--- SetupWizard_phone-out/com/google/common/collect/ImmutableMap.smali	2015-10-06 02:45:56.585432054 +0200
+++ SetupWizard_tab-out/com/google/common/collect/ImmutableMap.smali	2015-10-06 02:46:08.841432045 +0200
@@ -3,8 +3,8 @@
.source "ImmutableMap.java"

# interfaces
-.implements Ljava/io/Serializable;
.implements Ljava/util/Map;
+.implements Ljava/io/Serializable;

# annotations
diff -ru SetupWizard_phone-out/com/google/common/collect/ImmutableSortedSet.smali SetupWizard_tab-out/com/google/common/collect/ImmutableSortedSet.smali
--- SetupWizard_phone-out/com/google/common/collect/ImmutableSortedSet.smali	2015-10-06 02:45:56.609432054 +0200
+++ SetupWizard_tab-out/com/google/common/collect/ImmutableSortedSet.smali	2015-10-06 02:46:08.861432045 +0200
@@ -3,8 +3,8 @@
.source "ImmutableSortedSet.java"

# interfaces
-.implements Lcom/google/common/collect/SortedIterable;
.implements Ljava/util/SortedSet;
+.implements Lcom/google/common/collect/SortedIterable;

# annotations
diff -ru SetupWizard_phone-out/com/google/common/collect/MapMakerInternalMap.smali SetupWizard_tab-out/com/google/common/collect/MapMakerInternalMap.smali
--- SetupWizard_phone-out/com/google/common/collect/MapMakerInternalMap.smali	2015-10-06 02:45:56.697432054 +0200
+++ SetupWizard_tab-out/com/google/common/collect/MapMakerInternalMap.smali	2015-10-06 02:46:08.953432045 +0200
@@ -3,8 +3,8 @@
.source "MapMakerInternalMap.java"

# interfaces
-.implements Ljava/io/Serializable;
.implements Ljava/util/concurrent/ConcurrentMap;
+.implements Ljava/io/Serializable;

# annotations
diff -ru SetupWizard_phone-out/com/google/common/collect/MapMaker$NullConcurrentMap.smali SetupWizard_tab-out/com/google/common/collect/MapMaker$NullConcurrentMap.smali
--- SetupWizard_phone-out/com/google/common/collect/MapMaker$NullConcurrentMap.smali	2015-10-06 02:45:56.625432054 +0200
+++ SetupWizard_tab-out/com/google/common/collect/MapMaker$NullConcurrentMap.smali	2015-10-06 02:46:08.885432045 +0200
@@ -3,8 +3,8 @@
.source "MapMaker.java"

# interfaces
-.implements Ljava/io/Serializable;
.implements Ljava/util/concurrent/ConcurrentMap;
+.implements Ljava/io/Serializable;

# annotations
diff -ru SetupWizard_phone-out/com/google/common/primitives/Ints$IntArrayAsList.smali SetupWizard_tab-out/com/google/common/primitives/Ints$IntArrayAsList.smali
--- SetupWizard_phone-out/com/google/common/primitives/Ints$IntArrayAsList.smali	2015-10-06 02:45:56.781432054 +0200
+++ SetupWizard_tab-out/com/google/common/primitives/Ints$IntArrayAsList.smali	2015-10-06 02:46:09.033432044 +0200
@@ -3,8 +3,8 @@
.source "Ints.java"

# interfaces
-.implements Ljava/io/Serializable;
.implements Ljava/util/RandomAccess;
+.implements Ljava/io/Serializable;

# annotations