merged senecasos repo

2012-03-09 11:08:22 +01:00
parent 5ede7d4756 debb90409a
commit 781f089ee1
20 changed files with 997 additions and 116 deletions
--- a/src/org/thialfihar/android/apg/EditKeyActivity.java
+++ b/src/org/thialfihar/android/apg/EditKeyActivity.java
@@ -288,4 +288,4 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
        mChangePassPhrase.setText(
                havePassPhrase() ? R.string.btn_changePassPhrase : R.string.btn_setPassPhrase);
    }
-}
+}