repo sync 9ab66ff42f resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp ...

Change-Id: Ic82ab20e216d810f6372c833ac49c3856449c09c

2011-03-22 11:47:39 -07:00

..

AbstractAccountAuthenticator.java

- add verbose logging to the authenticator

2010-03-09 09:45:16 -08:00

Account.aidl

…

Account.java

…

AccountAuthenticatorActivity.java

…

AccountAuthenticatorCache.java

DO NOT MERGE

2011-03-01 11:20:06 -08:00

AccountAuthenticatorResponse.java

- add verbose logging to the authenticator

2010-03-09 09:45:16 -08:00

AccountManager.java

DO NOT MERGE

2011-03-01 11:20:06 -08:00

AccountManagerCallback.java

…

AccountManagerFuture.java

…

AccountManagerResponse.java

…

AccountManagerService.java

resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp

2011-03-22 11:47:39 -07:00

AccountsException.java

…

AuthenticatorDescription.aidl

…

AuthenticatorDescription.java

DO NOT MERGE

2011-03-01 11:20:06 -08:00

AuthenticatorException.java

…

ChooseAccountActivity.java

Fix bug #3338957 (Account Picker and Account type picker need love)

2011-01-21 14:58:02 -08:00

GrantCredentialsPermissionActivity.java

Fix bug 3378333 - Holo-style layout for granting permissions

2011-01-25 13:34:28 -08:00

IAccountAuthenticator.aidl

…

IAccountAuthenticatorCache.java

add caching to the AccountManagerService

2010-12-03 15:35:48 -08:00

IAccountAuthenticatorResponse.aidl

…

IAccountManager.aidl

rename testHasFeatures to hasFeatures

2010-01-15 11:05:44 -08:00

IAccountManagerResponse.aidl

…

NetworkErrorException.java

…

OnAccountsUpdateListener.java

…

OperationCanceledException.java

…