Dominik Schürmann 0e152d1db0 Merge branch 'master' of github.com:open-keychain/open-keychain ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

2014-08-20 19:48:19 +02:00

..

ContactSyncAdapterService.java

Optimize imports

2014-08-05 22:46:00 +02:00

DummyAccountService.java

Optimize imports

2014-08-05 22:46:00 +02:00

KeychainIntentService.java

Merge branch 'master' of github.com:open-keychain/open-keychain

2014-08-20 19:48:19 +02:00

KeychainIntentServiceHandler.java

use SuperToast instead of AppMsg in code, part 1

2014-07-07 17:34:41 +02:00

OperationResultParcel.java

Fixes and temporary fixes for returning results

2014-08-20 19:46:44 +02:00

OperationResults.java

consolidate: working implementation, lacking ui

2014-08-17 03:29:03 +02:00

PassphraseCacheService.java

Fix encrypt only

2014-08-16 03:59:58 +02:00

SaveKeyringParcel.java

Optimize imports

2014-08-05 22:46:00 +02:00