1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc
Merge branch 'master' into apg_service Conflicts: src/org/thialfihar/android/apg/Apg.java src/org/thialfihar/android/apg/Preferences.java
Description
Languages
Java
99.2%
Python
0.3%
Shell
0.2%
Standard ML
0.2%