Vincent Breitmoser 71c53f13ec fix small merge conflict oversight

2014-12-30 16:24:20 +01:00

..

assets

remove leftover of AndroidBootstrap

2014-06-30 22:05:02 +02:00

java

fix small merge conflict oversight

2014-12-30 16:24:20 +01:00

res

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

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

AndroidManifest.xml

New work on PIN and lock pattern UI

2014-12-29 23:16:54 +01:00