open-keychain/OpenKeychain/src/main
Vincent Breitmoser 0b16a4edfd Merge remote-tracking branch 'origin/master'
Conflicts:
	OpenKeychain/src/main/AndroidManifest.xml
2014-09-29 21:32:21 +02:00
..
assets remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
java Merge remote-tracking branch 'origin/master' 2014-09-29 21:32:21 +02:00
res be more mindful of algorithm and usage flag interaction 2014-09-28 14:25:54 +02:00
AndroidManifest.xml Merge remote-tracking branch 'origin/master' 2014-09-29 21:32:21 +02:00