Vincent Breitmoser 2a96912a96 Merge branch 'master' of github.com:open-keychain/open-keychain		2014-08-20 19:34:42 +02:00
..
assets	remove leftover of AndroidBootstrap	2014-06-30 22:05:02 +02:00
java	consolidate: implement (mostly) recovery mode	2014-08-20 19:34:36 +02:00
res	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 19:34:42 +02:00
AndroidManifest.xml	Fix mime types, #781	2014-08-19 18:54:48 +02:00