Merge branch 'master' into apg_service Conflicts: src/org/thialfihar/android/apg/Apg.java src/org/thialfihar/android/apg/Preferences.java |
||
---|---|---|
.. | ||
org/thialfihar/android/apg |
Merge branch 'master' into apg_service Conflicts: src/org/thialfihar/android/apg/Apg.java src/org/thialfihar/android/apg/Preferences.java |
||
---|---|---|
.. | ||
org/thialfihar/android/apg |