Vincent Breitmoser abd1211613 hack to make WrappedUserAttribute serializable ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java		2015-01-13 20:42:40 +01:00
..
assets	remove leftover of AndroidBootstrap	2014-06-30 22:05:02 +02:00
java	hack to make WrappedUserAttribute serializable	2015-01-13 20:42:40 +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