Vincent Breitmoser e54dd26d29 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java		2014-07-07 18:19:52 +02:00
..
src	Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'	2014-07-07 18:19:52 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Deprecated Android Bootstrap, thus fixing #597	2014-06-30 19:18:20 +02:00