Dominik Schürmann ce3a1f4c33 Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel		2015-03-31 00:32:56 +02:00
..
assets	remove leftover of AndroidBootstrap	2014-06-30 22:05:02 +02:00
java	Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel	2015-03-31 00:32:56 +02:00
res	From passphrase to password	2015-03-31 00:32:48 +02:00
AndroidManifest.xml	remove unused NfcActivity	2015-03-30 23:39:36 +02:00