Marco Nelissen c81e43c8ee resolved conflicts for merge 31957f1b to eclair-mr2

2009-10-29 18:04:17 -07:00

..

AbstractAccountAuthenticator.java

- add javadoc for the account manager

2009-10-28 16:29:21 -07:00

Account.aidl

Automated import from //branches/master/...@142414,142414

2009-03-24 22:48:12 -07:00

Account.java

do not merge: cherrypicked 3710f39096 from master branch

2009-08-15 22:40:25 -07:00

AccountAuthenticatorActivity.java

- add javadoc for the account manager

2009-10-28 16:29:21 -07:00

AccountAuthenticatorCache.java

account manager api review changes

2009-10-05 11:19:49 -07:00

AccountAuthenticatorResponse.java

fix a javadoc build breakage

2009-10-05 14:21:53 -07:00

AccountManager.java

- add javadoc for the account manager

2009-10-28 16:29:21 -07:00

AccountManagerCallback.java

do not merge: cherrypicked 3710f39096 from master branch

2009-08-15 22:40:25 -07:00

AccountManagerFuture.java

update account manager javadoc

2009-10-22 16:56:08 -07:00

AccountManagerResponse.java

adding concept of features to accounts

2009-04-20 16:06:02 -07:00

AccountManagerService.java

resolved conflicts for merge 31957f1b to eclair-mr2

2009-10-29 18:04:17 -07:00

AccountsException.java

account manager api review changes

2009-10-05 11:19:49 -07:00

AuthenticatorDescription.aidl

add icon and label to the authenticator description

2009-06-15 15:57:30 -07:00

AuthenticatorDescription.java

update account manager javadoc

2009-10-22 16:56:08 -07:00

AuthenticatorException.java

account manager api review changes

2009-10-05 11:19:49 -07:00

ChooseAccountActivity.java

account manager api review changes

2009-10-05 11:19:49 -07:00

GrantCredentialsPermissionActivity.java

update the authtoken permission granting UI

2009-10-14 15:24:46 -07:00

IAccountAuthenticator.aidl

account manager api review changes

2009-10-05 11:19:49 -07:00

IAccountAuthenticatorResponse.aidl

account manager api review changes

2009-10-05 11:19:49 -07:00

IAccountManager.aidl

account manager api review changes

2009-10-05 11:19:49 -07:00

IAccountManagerResponse.aidl

adding concept of features to accounts

2009-04-20 16:06:02 -07:00

NetworkErrorException.java

account manager api review changes

2009-10-05 11:19:49 -07:00

OnAccountsUpdateListener.java

account manager api review changes

2009-10-05 11:19:49 -07:00

OperationCanceledException.java

account manager api review changes

2009-10-05 11:19:49 -07:00