Vincent Breitmoser b779211f55 Merge branch 'master' into v/multi-decrypt ...

this also fixes weird-bug

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
	OpenKeychain/src/main/res/values/strings.xml

2015-06-06 23:40:22 +02:00

..

src

Merge branch 'master' into v/multi-decrypt

2015-06-06 23:40:22 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Workaround for Samsung Android 4.2 bug

2015-05-10 04:58:44 +02:00

proguard-rules.pro

Add dontnote to proguard

2015-05-10 10:44:04 +02:00