Vincent Breitmoser a73e91c49c Merge branch 'master' into certs ... Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java		2014-03-15 00:18:50 +01:00
..
src/main	Merge branch 'master' into certs	2014-03-15 00:18:50 +01:00
.gitignore	New Gradle project structure	2014-01-27 14:18:25 +01:00
build.gradle	Lint changes after testing	2014-03-10 14:59:15 -04:00