Vincent Breitmoser 84eece622b support addition of user attributes ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/res/values/strings.xml

2015-01-13 20:41:01 +01:00

..

assets

remove leftover of AndroidBootstrap

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

java

support addition of user attributes

2015-01-13 20:41:01 +01:00

res

support addition of user attributes

2015-01-13 20:41:01 +01:00

AndroidManifest.xml

Passphrase wizard tests

2015-01-06 14:52:07 +01:00