fix conflicts

This commit is contained in:
jrecio 2016-05-09 15:08:32 +02:00 committed by David A. Velasco
parent dde82c75c6
commit be94b5663c

View file

@ -57,6 +57,7 @@ public class AuthenticatorActivityTest {
public static final String EXTRA_ACTION = "ACTION";
public static final String EXTRA_ACCOUNT = "ACCOUNT";
private int mResultCode = -2;
private int WAIT_LOGIN = 5000;