Dominik Schürmann 881a50207a Merge branch 'master' into yubikey ... Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle		2014-08-06 01:08:12 +02:00
..
AccountSettingsActivity.java	Update license header for 2014	2014-04-13 17:27:22 +02:00
AccountSettingsFragment.java	Optimize imports	2014-08-05 22:46:00 +02:00
AccountsListFragment.java
AppSettingsActivity.java	Fixes	2014-07-17 20:29:07 +02:00
AppSettingsFragment.java
AppsListActivity.java	Optimize imports	2014-04-15 22:52:21 +02:00
AppsListFragment.java	Update license header for 2014	2014-04-13 17:27:22 +02:00
RemoteServiceActivity.java	Add applications section to help	2014-05-07 18:31:31 +02:00