Fix merge mistakes

SUPERCILEX · SUPERCILEX · commit 29c09444c67b · 2018-03-26T12:25:59.000-07:00
Signed-off-by: Alex Saveau &lt;saveau.alexandre@gmail.com&gt;
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -307,7 +307,7 @@ public Task<AuthResult> silentSignIn(@NonNull final Context context,
             }
 
             googleOptions = google.getParams()
-                    .getParcelable(ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS);
+                    .getParcelable(ExtraConstants.GOOGLE_SIGN_IN_OPTIONS);
         }
 
         final GoogleSignInOptions finalGoogleOptions = googleOptions;

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ public Task<AuthResult> silentSignIn(@NonNull final Context context,`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`googleOptions = google.getParams()`
`310`		`- .getParcelable(ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS);`
	`310`	`+ .getParcelable(ExtraConstants.GOOGLE_SIGN_IN_OPTIONS);`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`final GoogleSignInOptions finalGoogleOptions = googleOptions;`