Vincent Breitmoser 9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml

2014-12-30 13:09:27 +01:00

..

src/main

Merge branch 'development' of github.com:open-keychain/open-keychain into development

2014-12-30 13:09:27 +01:00

.gitignore

Fix gitignore for lint

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

build.gradle

Add android-lockpattern library

2014-12-29 23:10:50 +01:00