Vincent Breitmoser 34fca975d7 Merge remote-tracking branch 'origin/master' into db-overhaul ... Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java		2014-04-03 14:56:35 +02:00
..
src	Merge remote-tracking branch 'origin/master' into db-overhaul	2014-04-03 14:56:35 +02:00
.gitignore	New Gradle project structure	2014-01-27 14:18:25 +01:00
build.gradle	test: add junit+robolectric to buildfiles and stub test file	2014-04-01 16:12:57 +02:00