Svet Ganov 890a210e41 resolve merge conflicts of eeeebd3 to master ...

Change-Id: I3aa0d1b9228be408837f7dd93a9b8268e564fc65

2016-08-24 00:13:36 -07:00

..

AbstractAccountAuthenticator.java

…

Account.aidl

…

Account.java

…

AccountAndUser.java

…

AccountAuthenticatorActivity.java

…

AccountAuthenticatorResponse.java

…

AccountManager.java

resolve merge conflicts of eeeebd3 to master

2016-08-24 00:13:36 -07:00

AccountManagerCallback.java

…

AccountManagerFuture.java

…

AccountManagerInternal.java

…

AccountManagerResponse.java

…

AccountsException.java

…

AuthenticatorDescription.aidl

…

AuthenticatorDescription.java

…

AuthenticatorException.java

…

CantAddAccountActivity.java

…

ChooseAccountActivity.java

…

ChooseAccountTypeActivity.java

…

ChooseTypeAndAccountActivity.java

…

GrantCredentialsPermissionActivity.java

…

IAccountAuthenticator.aidl

…

IAccountAuthenticatorResponse.aidl

…

IAccountManager.aidl

resolve merge conflicts of eeeebd3 to master

2016-08-24 00:13:36 -07:00

IAccountManagerResponse.aidl

…

NetworkErrorException.java

…

OnAccountsUpdateListener.java

…

OperationCanceledException.java

…