https://github.com/rtyley/spongycastle It replaces bouncycastle2. Looks like a cleaner and better integration. A precompiled .jar ist in the "lib/"-dir.
Merge branch 'master' into apg_service Conflicts: src/org/thialfihar/android/apg/Apg.java src/org/thialfihar/android/apg/Preferences.java