mar-v-in cae0071342 Merge branch 'master' into automatic-contact-discovery ...

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

2014-06-04 21:32:37 +02:00

..

ContactSyncAdapterService.java

First version of automatic contact discovery.

2014-06-04 18:05:16 +02:00

DummyAccountService.java

First version of automatic contact discovery.

2014-06-04 18:05:16 +02:00

KeychainIntentService.java

Merge branch 'master' into automatic-contact-discovery

2014-06-04 21:32:37 +02:00

KeychainIntentServiceHandler.java

Removed unused Toast import

2014-05-11 22:20:44 +02:00

OldSaveKeyringParcel.java

rename SaveKeyringParcel to OldSaveKeyringParcel

2014-05-27 13:53:01 +02:00

PassphraseCacheService.java

new savekeyring operation (mostly stub)

2014-05-27 13:56:30 +02:00

SaveKeyringParcel.java

new savekeyring operation (mostly stub)

2014-05-27 13:56:30 +02:00