Vincent Breitmoser 2f95100d88 Merge remote-tracking branch 'origin/master' into wrapped-key-ring ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml		2014-05-14 16:02:28 +02:00
..
ui	Add applications section to help	2014-05-07 18:31:31 +02:00
AccountSettings.java	Removing remaining uses of Id, closing one of the oldest bugs #9	2014-04-14 13:48:20 +02:00
AppSettings.java	Rename folder structure from OpenPGP Keychain to OpenKeychain	2014-04-06 12:57:42 +02:00
OpenPgpService.java	Merge remote-tracking branch 'origin/master' into wrapped-key-ring	2014-05-14 16:02:28 +02:00
RemoteService.java	Remove unused blob classes and other dead code	2014-04-13 17:46:39 +02:00