fix merge mistake

Aaron Mandle · Aaron Mandle · commit a03e9186ca7d · 2016-10-17T13:35:21.000-07:00
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java
@@ -64,7 +64,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (mProvider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {
             mIDPProvider = new FacebookProvider(this, providerConfig);
         } else if (mProvider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {
-            mIDPProvider = new GoogleProvider(this, mEmail, providerConfig);
+            mIDPProvider = new GoogleProvider(this, providerConfig, mEmail);
         } else if (mProvider.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {
             mIDPProvider = new TwitterProvider(this);
         }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`64`	`64`	`if (mProvider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {`
`65`	`65`	`mIDPProvider = new FacebookProvider(this, providerConfig);`
`66`	`66`	`} else if (mProvider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {`
`67`		`- mIDPProvider = new GoogleProvider(this, mEmail, providerConfig);`
	`67`	`+ mIDPProvider = new GoogleProvider(this, providerConfig, mEmail);`
`68`	`68`	`} else if (mProvider.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {`
`69`	`69`	`mIDPProvider = new TwitterProvider(this);`
`70`	`70`	`}`